diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index e5bdcb28..32f67d7d 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -86,17 +86,29 @@ CHECKTEMP(){
 				[ "${last_sensor%%-*}" == "${SENSOR%%-*}" ] && [ "${last_sensor}" != "Offsite-ServerRoom" ] && echo -en "\033[1A"
 				c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
 				if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then
-					echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}"
+					echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}Pulling data ... "
+					reading=$(CHECKTEMPSENSOR ${SENSOR})
+					echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}${idsCL[Default]}"
 					if [ "${avgdays}" != "noavg" ]; then
-						echo -en "Pulling data and calculating ${avgdays_disp} average ... "
+						echo -en " / ${idsCL[Yellow]}Calculating ${avgdays_disp} average ... "
+						average=$(AVERAGETEMP ${SENSOR} ${avgdays})
+						([ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]) && average_disp=$(IDS_NUMBER_FORMAT ${average}) || average_disp=${average}
+						c=0; spca=''; spc1=`expr 6 - ${#average_disp}`; until [ ${c} = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done
+						if [ "${average_disp}" == "" ]; then
+							averagedisp="${idsCL[Green]}"
+						elif [ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]; then
+							averagedisp="${idsCL[Yellow]}${average}"
+						elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ]; then
+							averagedisp="${idsCL[LightRed]}${average_disp}"
+						else
+							averagedisp="${idsCL[Green]}${average_disp}"
+						fi
+						echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} /${spca}${averagedisp}${GAUGESH}${idsCL[Default]}"
 					else
-						echo -en "Pulling data ... "
+						echo
 					fi
-					reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays})
-					echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}${idsCL[Default]}"
 				else
 					if [ "${avgdays}" != "noavg" ]; then
-						[ "${avgdays}" == "" ] && avgdays=3d
 						average=$(AVERAGETEMP ${SENSOR} ${avgdays})
 						echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}${idsCL[Default]}"
 					else
@@ -231,16 +243,16 @@ CHECKTEMPSENSOR(){
 	else
 		GAUGESH="°F"
 	fi
-	if [ "${6}" != "noavg" ]; then
-		[ "${6}" != "" ] && [[ "${6}" =~ ^[0-9]+$ ]] && avgdays=${6} || avgdays=3d
-		if [ "${PW_SENSOR_TYPE[${1}]}" != "esxi" ]; then
-			average=$(AVERAGETEMP ${1} ${avgdays})
-		else
-			average=$(AVERAGETEMP ${1} ${avgdays} ${5})
-		fi
-	else
-		average=''
-	fi
+	# if [ "${6}" != "noavg" ]; then
+	# 	[ "${6}" != "" ] && [[ "${6}" =~ ^[0-9]+$ ]] && avgdays=${6} || avgdays=3d
+	# 	if [ "${PW_SENSOR_TYPE[${1}]}" != "esxi" ]; then
+	# 		average=$(AVERAGETEMP ${1} ${avgdays})
+	# 	else
+	# 		average=$(AVERAGETEMP ${1} ${avgdays} ${5})
+	# 	fi
+	# else
+	# 	average=''
+	# fi
 	
 	TIMEOUT=0
 	if [ "${PW_SENSOR_TYPE[${1}]}" == "mqtt" ]; then
@@ -312,19 +324,19 @@ CHECKTEMPSENSOR(){
 		c=0; spct=''; [ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]] && spc1=`expr 5 - ${#temp_f}` || spc1=`expr 6 - ${#temp_f}`
 		until [ ${c} = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done
 		
-		if [ "${average}" != "" ]; then
-			([ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]]) && average_disp=$(IDS_NUMBER_FORMAT ${average}) || average_disp=${average}
-			c=0; spca=''; spc1=`expr 6 - ${#average_disp}`; until [ ${c} = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done
-			if [ "${average_disp}" == "" ]; then
-				averagedisp="${idsCL[Green]}"
-			elif [ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]; then
-				averagedisp="${idsCL[Yellow]}${average}"
-			elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ]; then
-				averagedisp="${idsCL[LightRed]}${average_disp}"
-			else
-				averagedisp="${idsCL[Green]}${average_disp}"
-			fi
-		fi
+		# if [ "${average}" != "" ]; then
+		# 	([ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]]) && average_disp=$(IDS_NUMBER_FORMAT ${average}) || average_disp=${average}
+		# 	c=0; spca=''; spc1=`expr 6 - ${#average_disp}`; until [ ${c} = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done
+		# 	if [ "${average_disp}" == "" ]; then
+		# 		averagedisp="${idsCL[Green]}"
+		# 	elif [ $(bc -l <<< "${average} >= ${temp_warn}") -eq 1 ] && [ $(bc -l <<< "${average} < ${temp_crit}") -eq 1 ]; then
+		# 		averagedisp="${idsCL[Yellow]}${average}"
+		# 	elif [ $(bc -l <<< "${average} >= ${temp_crit}") -eq 1 ]; then
+		# 		averagedisp="${idsCL[LightRed]}${average_disp}"
+		# 	else
+		# 		averagedisp="${idsCL[Green]}${average_disp}"
+		# 	fi
+		# fi
 		
 		if [ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]]; then
 			temp_f_disp=$(IDS_NUMBER_FORMAT ${temp_f} 0)