diff --git a/defaults.inc b/defaults.inc
index 3934bcec..ffc92b01 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -63,7 +63,7 @@ PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10'
 PW_REMOTE_SENSORS['OctoPi-CPU']='10.10.1.80'
 PW_REMOTE_SENSORS['OctoPi-CPU-Usage']='10.10.1.80'
 
-PW_SENSOR_ORD=(ServerRoomTH Powerwall-CPU OctoPi-CPU iDS-vMS-Host0 iDS-vMS-Host1 iDS-vMS-Host6 iDS-vMS-Host7 OFF-vMS-Host1)
+PW_SENSOR_ORD=(ServerRoomTH Powerwall-CPU Powerwall-CPU-Usage OctoPi-CPU OctoPi-CPU-Usage iDS-vMS-Host0 iDS-vMS-Host1 iDS-vMS-Host6 iDS-vMS-Host7 OFF-vMS-Host1)
 # PW_SENSOR_ORD=(iDS-vMS-Host0)
 
 declare -A PW_SENSOR_ID
diff --git a/powerwall.sh b/powerwall.sh
index e9a78d27..22f5ca21 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -91,13 +91,13 @@ CHECKTEMP(){
 				c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
 				echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
 				
-				if [ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]; then
-					SENSOR="${SENSOR}-Usage"
-					echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
-					reading=$(CHECKTEMPSENSOR ${SENSOR})
-					c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
-					echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
-				fi
+				# if [ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]; then
+				# 	SENSOR="${SENSOR}-Usage"
+				# 	echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
+				# 	reading=$(CHECKTEMPSENSOR ${SENSOR})
+				# 	c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
+				# 	echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
+				# fi
 			fi
 			echo
 		fi
@@ -299,6 +299,18 @@ CHECKTEMP_SERVICE(){
 							vSENSOR=${SENSOR}
 							SENSOR="${SENSORa}-${vSENSOR// /_}"
 							((t++))
+							
+						elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then
+							if [ "${SENSORa}" == "Powerwall-CPU-Usage" ]; then
+								temp_c=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g')
+							else
+								temp_c=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} "/opt/idssys/defaults/get-data.sh cpu-usage")
+							fi
+							echo ${PW_TEMP_THRESHOLDS[${SENSORa}]} | cut -d',' -f 1 | read temp_warn
+							echo ${PW_TEMP_THRESHOLDS[${SENSORa}]} | cut -d',' -f 2 | read temp_crit	
+							temp_crit_sys=${temp_crit}
+							temp_h=''
+							
 						fi
 						
 						logtemp=${PW_LOGFOLDER}/log-temp-${SENSOR}