diff --git a/powerwall.sh b/powerwall.sh
index 0ee5c182..daf78fd8 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -95,7 +95,7 @@ CHECKTEMP(){
 CHECKTEMPSENSOR(){
 	echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 1 | read temp_warn
 	echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 2 | read temp_crit
-	# [ "${PW_SENSOR_TYPE[${1}]}" != "esxi" ] && average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3) || average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3 ${5})
+	[ "${PW_SENSOR_TYPE[${1}]}" != "esxi" ] && average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3) || average=$(AVERAGETEMP ${PW_SENSOR_ID[${1}]} 3 ${5})
 	
 	if [ "${PW_SENSOR_TYPE[${1}]}" == "mqtt" ]; then
 		mqtt_message=`${mqtt_conn} -t tele/${1}/SENSOR -C 1`
@@ -123,17 +123,17 @@ CHECKTEMPSENSOR(){
 		#echo "$temp_c -> $temp_f"
 		c=0; spct=''; spc1=`expr 6 - ${#temp_f}`; until [ $c = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done
 		
-		# c=0; spca=''; spc1=`expr 6 - ${#average}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done
-		# if [ "${average}" == "" ]; then
-		# 	averagedisp="${idsCL[Green]}"
-		# elif [ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]; then
-		# 	averagedisp="${idsCL[Yellow]}${average}'F"
-		# elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ]; then
-		# 	averagedisp="${idsCL[Red]}${average}'F"
-		# else
-		# 	averagedisp="${idsCL[Green]}${average}'F"
-		# fi
-		averagedisp='       '
+		c=0; spca=''; spc1=`expr 6 - ${#average}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done
+		if [ "${average}" == "" ]; then
+			averagedisp="${idsCL[Green]}"
+		elif [ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]; then
+			averagedisp="${idsCL[Yellow]}${average}'F"
+		elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ]; then
+			averagedisp="${idsCL[Red]}${average}'F"
+		else
+			averagedisp="${idsCL[Green]}${average}'F"
+		fi
+		# averagedisp='       '
 		
 		if [ $(bc -l <<< "$temp_f >= $temp_warn") -eq 1 ] && [ $(bc -l <<< "$temp_f < $temp_crit") -eq 1 ]; then
 			echo -en "${idsCL[Yellow]}WARNING  (${spct}${temp_f}'F / ${spca}${averagedisp}${idsCL[Yellow]})${idsCL[Default]}"