diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 5124e9b8..c268b7a8 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -82,6 +82,21 @@ CHECKTEMP(){
 			echo -e "${idsCL[LightYellow]}SENSOR TEMPERATURE(S)                Current             ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
 		fi
 		DIVIDER . yellow ${PRI_WIDTH}
+		
+		if [ "${avgdays}" = "noavg" ] && [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fans" ] && [[ "${SENSOR}" = *"Room"* ]])); then
+			sensorsqry=''
+			for SENSOR in ${PW_SENSOR_ORD[@]}; do
+				if [[ "${SENSOR}" != *"FAN"* ]]; then
+					[ "${sensorsqry}" != "" ] && sensorsqry="${sensorsqry},${PW_SENSOR_ID[${SENSOR}]}" || sensorsqry=${PW_SENSOR_ID[${SENSOR}]}
+				fi
+			done
+			declare -A RANGE_TEMPS
+			for R in ${PW_TEMPIND_RANGE[@]}; do
+				RANGE_TEMPS[${R}]=($(${mysql_conn} -e "SELECT sensorid,temp FROM servermonitor.sensor_data WHERE sensorid IN (${sensorqry}) AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
+				echo "${R} = ${RANGE_TEMPS[@]}"
+			done
+		fi
+		
 		for SENSOR in ${PW_SENSOR_ORD[@]}; do
 			if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fans" ] && [[ "${SENSOR}" = *"Room"* ]])); then
 				[ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR}