diff --git a/defaults.inc b/defaults.inc
index ad212b6f..4b825685 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.3.160-11042023'
+VERS='2.3.162-11052023'
 
 noheader=' update service dailytemp '
 
diff --git a/powerwall.sh b/powerwall.sh
index ca11c122..df046de8 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -519,17 +519,17 @@ CHECKPOWER(){
 			[[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.2f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 			BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
-			[[ "${BATTA}" == *"-"* ]] && BATTA_disp="${idsCL[Green]}${BATTA}'A - Charging" || BATTA_disp="${idsCL[LightRed]}${BATTA}'A - Discharging"
+			[[ "${BATTA}" == *"-"* ]] && BATTA_disp="${idsCL[Green]}${BATTA}'Amps - Charging" || BATTA_disp="${idsCL[LightRed]}${BATTA}'Amps - Discharging"
 		fi
 
-		echo -e "${idsCL[LightCyan]}Inverter Input Volts     ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}'V"
-		echo -e "${idsCL[LightCyan]}Inverter Input Amps      ${idsCL[Default]}: ${idsCL[Green]}${INPUTA}'A"
+		echo -e "${idsCL[LightCyan]}Inverter Input Volts     ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}'Volts"
+		echo -e "${idsCL[LightCyan]}Inverter Input Amps      ${idsCL[Default]}: ${idsCL[Green]}${INPUTA}'Amps"
 		echo
-		echo -e "${idsCL[LightCyan]}Inverter Output Volts    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}'V / ${OUTPUTV2}'V"
-		echo -e "${idsCL[LightCyan]}Inverter Output Amps     ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTA}'A / ${OUTPUTA2}'A"
-		echo -e "${idsCL[LightCyan]}Inverter Output Watts    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTW}'W"
+		echo -e "${idsCL[LightCyan]}Inverter Output Volts    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}'Volts / ${OUTPUTV2}'Volts"
+		echo -e "${idsCL[LightCyan]}Inverter Output Amps     ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTA}'Amps / ${OUTPUTA2}'Amps"
+		echo -e "${idsCL[LightCyan]}Inverter Output Watts    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTW}'Watts"
 		echo
-		echo -e "${idsCL[LightCyan]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'V${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'Volts${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Battery Amps Chg/DChg    ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
 		echo
 
@@ -551,8 +551,8 @@ CHECKPOWER(){
 			[[ "${APCPDU_WATT}" == *"."* ]] && [[ "${APCPDU_WATT}" != *".0"* ]] && APCPDU_WATT_disp=`printf "%'.2f\n" ${APCPDU_WATT}` || APCPDU_WATT_disp=`printf "%'.0f\n" ${APCPDU_WATT}`
 		# fi
 
-		echo -e "${idsCL[LightCyan]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'A${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'W ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'Amps${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'Watts ~ estimate${idsCL[Default]}"
 		echo
 
 		if [ "${SVRRM_VOLT}" != "" ]; then
@@ -564,14 +564,14 @@ CHECKPOWER(){
 			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc`
 		fi
 
-		echo -e "${idsCL[LightCyan]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'A ~ estimate${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT}'W ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'Amps ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT}'Watts ~ estimate${idsCL[Default]}"
 		echo
 
-		echo -e "${idsCL[LightCyan]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'V${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'V${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT_disp}'W${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'Volts${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'Volts${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'Amps${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT_disp}'Watts${idsCL[Default]}"
 		echo
 		
 		########
@@ -594,11 +594,11 @@ CHECKPOWER(){
 		
 		# fi
 	
-		echo -e "${idsCL[LightCyan]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'V${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'V${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'Volts${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'Volts${idsCL[Default]}"
 		echo
-		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'A ~ estimate${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'W ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'Amps ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'Watts ~ estimate${idsCL[Default]}"
 		echo
 		echo -e "${idsCL[LightCyan]}Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_CAP}%${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'mins${idsCL[Default]}"
@@ -616,7 +616,7 @@ CHECKPOWER(){
 		for SENSOR in ${PW_SENSOR_ORD[@]}; do
 			if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
 				HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3 | sed 's/.*: //')
-				[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'W"
+				[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'Watts"
 				echo -e "${idsCL[LightCyan]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[Default]}"
 			fi
 		done
@@ -653,31 +653,31 @@ CHECKPOWER_SERVICE(){
 			
 			if (( $(bc <<<"${INPUTACV} >= ${min_acvolt}") )); then
 				if [ ${voltstatus} -eq 3 ]; then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V - Back to Normal Voltage" >> ${PW_LOGPOWER}
+					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'Volts - Back to Normal Voltage" >> ${PW_LOGPOWER}
 					SENDNOTICE "POWER NOMINAL AGAIN" "Normal voltage detected
-VOLTAGE: ${INPUTACV}'V"
-					echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V - POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
+VOLTAGE: ${INPUTACV}'Volts"
+					echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'Volts - POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
 					battstatus=0
 				else
-					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge 3600 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V - Normal Voltage" >> ${PW_LOGPOWER}
+					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge 3600 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'Volts - Normal Voltage" >> ${PW_LOGPOWER}
 					if [ ${voltstatus} -eq 0 ]; then
 						SENDNOTICE "Power Nominal" "Service Startup
 Normal voltage detected
-VOLTAGE: ${INPUTACV}'V
-BATT VOLTAGE: ${BATTVOLT}'V"
-						echo "($(date +'%Y-%m-%d %H:%M:%S')) - Input: ${INPUTACV}'V - Service Startup - Normal voltage detected" >> ${PW_LOGPOWER}
-						echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V / ${BATTVOLT}'V - Service Startup - Normal Voltage" >> ${PW_LOGFILE}
+VOLTAGE: ${INPUTACV}'Volts
+BATT VOLTAGE: ${BATTVOLT}'Volts"
+						echo "($(date +'%Y-%m-%d %H:%M:%S')) - Input: ${INPUTACV}'Volts - Service Startup - Normal voltage detected" >> ${PW_LOGPOWER}
+						echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'Volts / ${BATTVOLT}'Volts - Service Startup - Normal Voltage" >> ${PW_LOGFILE}
 					fi
 				fi
 				voltstatus=1
 				rm -f ${PW_TMPFOLDER}/power.ac.*
 			else
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V - POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
-				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V - POWER OFF/LOW POWER" >> ${PW_LOGFILE}
+				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'Volts - POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
+				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'Volts - POWER OFF/LOW POWER" >> ${PW_LOGFILE}
 				if [ ${voltstatus} -lt 3 ]; then
 					SENDNOTICE "POWER ALERT - POWER OFF/LOW POWER!!" "Power off or low voltage detected
-VOLTAGE: ${INPUTACV}'V
-BATT VOLTAGE: ${BATTVOLT}'V" 1
+VOLTAGE: ${INPUTACV}'Volts
+BATT VOLTAGE: ${BATTVOLT}'Volts" 1
 					last_battvolt=${BATTVOLT}
 					voltstatus=3
 					touch ${PW_TMPFOLDER}/power.ac.low
@@ -690,24 +690,24 @@ BATT VOLTAGE: ${BATTVOLT}'V" 1
 			fi
 			
 			if (( $(bc <<<"${BATTVOLT} < ${min_battvolt} && ${BATTVOLT} > ${min_battvolt_sys}") )); then
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - LOW BATTERY Voltage" >> ${PW_LOGPOWER}
-				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - LOW BATTERY VOLTAGE" >> ${PW_LOGFILE}
+				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - LOW BATTERY Voltage" >> ${PW_LOGPOWER}
+				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - LOW BATTERY VOLTAGE" >> ${PW_LOGFILE}
 				touch ${PW_TMPFOLDER}/power.dc.low
 				if (( $(bc <<<"${battstatus} < 2 && ${INPUTACV} < ${min_acvolt}") )); then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - Shutting down main servers..." >> ${PW_LOGPOWER}
-					SENDNOTICE "BATT-VOLT LOW: SHUTDOWN MAIN SERVERS" "Battery Voltage LOW: ${BATTVOLT}'V
+					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - Shutting down main servers..." >> ${PW_LOGPOWER}
+					SENDNOTICE "BATT-VOLT LOW: SHUTDOWN MAIN SERVERS" "Battery Voltage LOW: ${BATTVOLT}'Volts
 Shutting down main servers" 1
 					SHUTDOWN_MAIN POWER &
 					battstatus=2
 				fi
 			
 			elif (( $(bc <<<"${BATTVOLT} <= ${min_battvolt_sys}") )); then
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - LOW BATTERY Voltage" >> ${PW_LOGPOWER}
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - LOW BATTERY VOLTAGE" >> ${PW_LOGFILE}
+				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - LOW BATTERY Voltage" >> ${PW_LOGPOWER}
+				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - LOW BATTERY VOLTAGE" >> ${PW_LOGFILE}
 				touch ${PW_TMPFOLDER}/power.dc.low
 				if (( $(bc <<<"${battstatus} < 3 && ${INPUTACV} < ${min_acvolt}") )); then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - Shutting down all remaining servers..." >> ${PW_LOGPOWER}
-					SENDNOTICE "BATT-VOLT REALLY LOW: SHUTDOWN SYS SERVERS" "Battery Voltage REALLY LOW: ${BATTVOLT}'V
+					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - Shutting down all remaining servers..." >> ${PW_LOGPOWER}
+					SENDNOTICE "BATT-VOLT REALLY LOW: SHUTDOWN SYS SERVERS" "Battery Voltage REALLY LOW: ${BATTVOLT}'Volts
 Shutting down all servers" 1
 					SHUTDOWN_SYS POWER &
 				
@@ -716,9 +716,9 @@ Shutting down all servers" 1
 				fi
 			
 			else
-				[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge 3600 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - Battery Voltage" >> ${PW_LOGPOWER}
+				[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge 3600 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - Battery Voltage" >> ${PW_LOGPOWER}
 				if [ ${battstatus} -eq 0 ]; then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - Battery: ${BATTVOLT}'V - Service Startup - Normal voltage detected" >> ${PW_LOGPOWER}
+					echo "($(date +'%Y-%m-%d %H:%M:%S')) - Battery: ${BATTVOLT}'Volts - Service Startup - Normal voltage detected" >> ${PW_LOGPOWER}
 				fi
 				battstatus=1
 			
@@ -727,8 +727,8 @@ Shutting down all servers" 1
 			volt_diff=`echo "scale=1; ${last_battvolt}-${BATTVOLT}" | bc`
 			(( $(bc <<<"${volt_diff} < 0") )) && temp_diff=`echo "scale=1; ${volt_diff} * -1" | bc`
 			if (( $(bc <<<"${volt_diff} > 0.5") )); then
-				SENDNOTICE "BATTERY VOLTAGE CHANGE" "Battery Voltage: ${BATTVOLT}'V"
-				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'V - Battery Voltage Change" >> ${PW_LOGPOWER}
+				SENDNOTICE "BATTERY VOLTAGE CHANGE" "Battery Voltage: ${BATTVOLT}'Volts"
+				echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${BATTVOLT}'Volts - Battery Voltage Change" >> ${PW_LOGPOWER}
 				last_battvolt=${BATTVOLT}
 			fi
 		else
@@ -740,29 +740,31 @@ Shutting down all servers" 1
 		if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then
 			OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //')
 			OFFSITE_VOLTIN=`echo "scale=2; ${OFFSITE_VOLTIN}/10" | bc`
-			OFFSITE_BATT=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.2.2.1.0 | sed 's/.*: //')
-
+			OFFSITE_BATT_RUNTIME=$(snmpwalk  -t 1 -r 0 -v 1 -c public 10.2.1.100 iso.3.6.1.2.1.33.1.2.3.0 | sed 's/.*: //')
+			OFFSITE_BATT_CAP=$(snmpwalk  -t 1 -r 0 -v 1 -c public 10.2.1.100 iso.3.6.1.2.1.33.1.2.4.0 | sed 's/.*: //')
+			
 			if (( $(bc <<<"${OFFSITE_VOLTIN} >= ${min_acvolt}") )); then
 				if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'V - Offsite Back to Normal Voltage" >> ${PW_LOGPOWER}
-					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'V - OFFSITE POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
+					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Back to Normal Voltage" >> ${PW_LOGPOWER}
+					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER NOMINAL AGAIN" >> ${PW_LOGFILE}
 					SENDNOTICE "OFFSITE POWER NOMINAL AGAIN" "Normal voltage detected
-VOLTAGE: ${OFFSITE_VOLTIN}'V"
+VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
 					rm -f ${PW_TMPFOLDER}/power.offsite.*
 				else
-					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -le 300 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'V - Offsite Normal Voltage" >> ${PW_LOGPOWER}
+					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -le 300 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Normal Voltage" >> ${PW_LOGPOWER}
 				fi
 			else
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'V - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
-				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'V - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGFILE}
+				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGPOWER}
+				echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGFILE}
 				
-				if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge 300 ]; then
+				if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge 240 ]; then
 					SENDNOTICE "OFFSITE POWER ALERT - POWER OFF/LOW!!" "Power off or low voltage detected
-VOLTAGE: ${OFFSITE_VOLTIN}'V" 1
+BATT CAPACITY: ${OFFSITE_BATT_CAP}'(percent)
+BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1
 					touch ${PW_TMPFOLDER}/power.offsite.ac.low
 				fi
 				
-				if [ ${OFFSITE_BATT} -le 70 ] && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then
+				if [ ${OFFSITE_BATT_CAP} -le 70 ] && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then
 					SHUTDOWN_OFFSITE &
 				fi
 			fi