diff --git a/defaults.inc b/defaults.inc
index bf5842c2..f1f8145e 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='2.3.320-12032023'
+VERS='2.3.330-12032023'
 
 noheader=' update service dailytemp '
 
@@ -38,13 +38,14 @@ declare -A PW_TEMP_THRESHOLDS
 PW_TEMP_THRESHOLDS['ServerRoomTH']="78,85,91" #Normal -4
 PW_TEMP_THRESHOLDS['Powerwall-CPU']="122,131,176"
 PW_TEMP_THRESHOLDS['Powerwall-CPU-Usage']="40,80"
-PW_TEMP_THRESHOLDS['OctoPI-CPU']="122,131,176"
+PW_TEMP_THRESHOLDS['OctoPi-CPU']="122,131,176"
 
 declare -A PW_SENSOR_TYPE
 PW_SENSOR_TYPE['ServerRoomTH']='mqtt'
 PW_SENSOR_TYPE['Powerwall-CPU']='system'
 PW_SENSOR_TYPE['Powerwall-CPU-Usage']='cpu'
-PW_SENSOR_TYPE['OctoPI-CPU']='remotesystem'
+PW_SENSOR_TYPE['OctoPi-CPU']='remotesystem'
+PW_SENSOR_TYPE['OctoPi-CPU-Usage']='cpu'
 PW_SENSOR_TYPE['iDS-vMS-Host0']='esxi'
 PW_SENSOR_TYPE['iDS-vMS-Host1']='esxi'
 # PW_SENSOR_TYPE['iDS-vMS-Host2']='esxi'
@@ -58,15 +59,16 @@ declare -A PW_REMOTE_SENSORS
 PW_REMOTE_SENSORS['Powerwall-CPU']='127.0.0.1'
 PW_REMOTE_SENSORS['Powerwall-CPU-Usage']='127.0.0.1'
 PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10'
-PW_REMOTE_SENSORS['OctoPI-CPU']='10.10.1.80'
+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 OctoPi-CPU 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
 PW_SENSOR_ID['ServerRoomTH']='2'
 PW_SENSOR_ID['Powerwall-CPU']='6'
-PW_SENSOR_ID['OctoPI-CPU']='7'
+PW_SENSOR_ID['OctoPi-CPU']='7'
 PW_SENSOR_ID['iDS-vMS-Host0']='8'
 PW_SENSOR_ID['iDS-vMS-Host1']='9'
 PW_SENSOR_ID['iDS-vMS-Host6']='13'
diff --git a/powerwall.sh b/powerwall.sh
index bcb5f257..815bc5ea 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -91,33 +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" ]; then
-					SENSOR="Powerwall-CPU-Usage"
+				if [ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]; then
+					[ "${SENSOR}" == "Powerwall-CPU" ] && SENSOR="Powerwall-CPU-Usage"
+					[ "${SENSOR}" == "OctoPi-CPU" ] && SENSOR="OctoPi-CPU-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}"
-					
-					
-					
-					# CPUPER=$(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))
-					# echo ${PW_TEMP_THRESHOLDS['Powerwall-CPU-Usage']} | cut -d',' -f 1 | read cpu_warn
-					# echo ${PW_TEMP_THRESHOLDS['Powerwall-CPU-Usage']} | cut -d',' -f 2 | read cpu_crit
-					#
-					# msg="Powerwall-CPU-Usage"
-					# c=0; spc=''; spc1=`expr ${cw} - ${#msg}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
-					# echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${msg}${idsST[Reset]}${spc}${idsCL[Default]}: "
-					#
-					# if [ $(bc -l <<< "${CPUPER} >= ${cpu_warn}") -eq 1 ] && [ $(bc -l <<< "${CPUPER} < ${cpu_crit}") -eq 1 ]; then
-					# 	echo -en "${idsCL[Yellow]}WARNING ${spct}${CPUPER}%${idsCL[Default]}"
-					# elif [ $(bc -l <<< "${CPUPER} >= ${cpu_crit}") -eq 1 ]; then
-					# 	echo -en "${idsCL[Red]}CRITICAL${spct}${CPUPER}%${idsCL[Default]}"
-					# else
-					# 	echo -en "${idsCL[Green]}Normal  ${spct}${CPUPER}%${idsCL[Default]}"
-					# fi
-					#
-					
-
 				fi
 			fi
 			echo
@@ -1230,10 +1210,10 @@ SHUTDOWN_CRIT(){
 		sleep 1s
 		/sbin/poweroff
 		
-	elif [ "${1}" == "OctoPI-CPU" ]; then
-		SENDNOTICE "${SENSOR} TEMP CRITICAL" "OctoPI System shutting down" 1
-		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - CRITICAL TEMP - OctoPI System shutting down" >> ${PW_LOGFOLDER}/log-temp-${1}
-		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSOR} TEMP CRITICAL - OctoPI System shutting down" >> ${PW_LOGFILE}
+	elif [ "${1}" == "OctoPi-CPU" ]; then
+		SENDNOTICE "${SENSOR} TEMP CRITICAL" "OctoPi System shutting down" 1
+		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - CRITICAL TEMP - OctoPi System shutting down" >> ${PW_LOGFOLDER}/log-temp-${1}
+		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSOR} TEMP CRITICAL - OctoPi System shutting down" >> ${PW_LOGFILE}
 		sleep 1s
 		ssh root@${PW_REMOTE_SENSORS[${1}]} /sbin/poweroff