diff --git a/powerwall.sh b/powerwall.sh
index 313019d4..e6604a00 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -40,25 +40,6 @@ CHECKTEMP_SERVICE(){
 	echo $mqtt_message | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c
 	echo $mqtt_message | cut -d'T' -f 2 | cut -d"\"" -f 3 | read temp_d
 	echo $mqtt_message | cut -d'T' -f 3 | cut -d"\"" -f 1 | read temp_t
-	if [ "$temp_c" != "null" ] && [ "$temp_c" != "" ]; then
-		temp_f=`echo "scale=2; $temp_c*1.8 + 32" | bc`
-		#echo "$temp_c -> $temp_f"
-		
-		echo ${TEMP_THRESHOLDS[${1}]} | cut -d',' -f 1 | read temp_warn
-		echo ${TEMP_THRESHOLDS[${1}]} | cut -d',' -f 2 | read temp_crit
-		
-		if [ $(bc -l <<< "$temp_f >= $temp_warn") -eq 1 ] && [ $(bc -l <<< "$temp_f < $temp_crit") -eq 1 ]; then
-			#echo "WARNING TEMP: $temp_f°F" | mail -s "${1} TEMP WARNING" $email_alert
-			echo "WARNING: $temp_f°F ($temp_d @ $temp_t)"
-		elif [ $(bc -l <<< "$temp_f >= $temp_crit") -eq 1 ]; then
-			#echo "CRITICAL TEMP: $temp_f°F" | mail -s "${1} TEMP CRITICAL" $email_alert
-			echo "CRITICAL: $temp_f°F ($temp_d @ $temp_t)"
-		else
-			#echo "NORMAL TEMP: $temp_f°F" | mail -s "${1} TEMP NORMAL" $email_alert
-			echo "normal: $temp_f°F ($temp_d @ $temp_t)"
-		fi
-	fi
-	
 	
 	while true
 	do
@@ -74,13 +55,13 @@ CHECKTEMP_SERVICE(){
 		
 				if [ $(bc -l <<< "$temp_f >= $temp_warn") -eq 1 ] && [ $(bc -l <<< "$temp_f < $temp_crit") -eq 1 ]; then
 					#echo "WARNING TEMP: $temp_f°F" | mail -s "${1} TEMP WARNING" $email_alert
-					echo "WARNING: $temp_f°F"
+					echo "WARNING: $temp_f°F ($temp_d @ $temp_t)"
 				elif [ $(bc -l <<< "$temp_f >= $temp_crit") -eq 1 ]; then
 					#echo "CRITICAL TEMP: $temp_f°F" | mail -s "${1} TEMP CRITICAL" $email_alert
-					echo "CRITICAL: $temp_f°F"
+					echo "CRITICAL: $temp_f°F ($temp_d @ $temp_t)"
 				else
 					#echo "NORMAL TEMP: $temp_f°F" | mail -s "${1} TEMP NORMAL" $email_alert
-					echo "normal: $temp_f°F"
+					echo "normal: $temp_f°F ($temp_d @ $temp_t)"
 				fi
 			fi
 	    done