diff --git a/motd.sh b/motd.sh
index f8b71e919f598ef2fa0d0fce6d1e8363f0d5c797..f74502a4468609076c222b235c2e433500169e9c 100755
--- a/motd.sh
+++ b/motd.sh
@@ -17,40 +17,37 @@ LAST=$(wc -l "$i" | cut -f1 -d' ')
 DOWN=$((LAST-END+2))
 
 sed '1,'"$((HEAD-1))"'d' "$i" | sed -n -e :a -e '1,'"$DOWN"'!{P;N;D;};N;ba' | sed '/<div/d' > "TMP.html"
-#sed '1,'"$((HEAD-1))"'d' "$i" | sed -n -e :a -e '1,'"$DOWN"'!{P;N;D;};N;ba'  > "TMP.html"
+rm "$i"
 
 title="Message of the day"
 head=$(cat TMP.html | grep "rss-item-title" | cut -d ">" -f 2 | cut -d "<" -f 1)
 date=$(cat TMP.html | grep "<i>" | cut -d ">" -f 2 | cut -d "<" -f 1 | cut -d " " -f 1)
 info=$(cat TMP.html | grep "<p>" | cut -d ">" -f 2 | cut -d "<" -f 1)
+rm TMP.html
 
 echo ""
 echo "$title"
-echo "$head"
-echo "$date"
+echo "$date - $head"
 echo "$info"
 echo ""
 
-if [ "$head" = "Salomon Maintenance" ] || [ "$head" = "Anselm Maintenance" ]; then
-	echo "add to table"
-
+# Salomon Maintenance, Anselm Maintenance, Back in Production, Infrastructure Maintenance, PBS Maintenance, SCRATCH Maintenance, HOME Maintenance, Salomon and Anselm Maintenance
+if [ "$head" = "Salomon Maintenance" ] || [ "$head" = "Anselm Maintenance" ] || [ "$head" = "Back in Production" ] || [ "$head" = "Infrastructure Maintenance" ] || [ "$head" = "PBS Maintenance" ] || [ "$head" = "SCRATCH Maintenance" ] || [ "$head" = "HOME Maintenance" ] || [ "$head" = "Salomon and Anselm Maintenance" ]; then
 	dateDown=$(cat downtimes_history.md | sed -n '/---/{n;p;}' | cut -d "|" -f 2 | cut -d " " -f 1)
 	headDown=$(cat downtimes_history.md | sed -n '/---/{n;p;}' | cut -d "|" -f 3 | cut -d "*" -f 3)	
 
-	echo "$dateDown ... $headDown"
-
 	if [ "$date" = "$dateDown" ] && [ "$head" = "$headDown" ]; then
-		echo "stejne"
+		echo "Everything up-to-date..."
 	else
-		echo "jine"
+		echo "Updating Downtime History..."
 		test="|$date|**$head** $info|"
 		sed '/---/a '"$test"'' downtimes_history.md > TMP.md
 		cat TMP.md > downtimes_history.md
+		rm TMP.md
 	fi
 	#echo "### $title" > MOTD.md
 	#echo "**$head**" >> MOTD.md
 	#echo "$date - $info" >> MOTD.md
+else
+	echo "Downtime History not updated..."
 fi
-
-rm "$i"
-rm TMP.html