diff --git a/offsite-power-check.sh b/offsite-power-check.sh
index bcc1fdd4..634e53fe 100755
--- a/offsite-power-check.sh
+++ b/offsite-power-check.sh
@@ -23,28 +23,6 @@ if [ "$TEST" = "true" ]; then
 	LOG_INTERVAL_ABNORMAL=1		#minutes
 fi
 
-
-SENDNOTICE(){
-	TITLE=${1}
-	MESSAGE="${2}
-
-$(date)"
-	MSGSOUND=Cosmic
-	
-	if [ "${3}" = "2" ]; then
-		PRIORITY="${3}&retry=60&expire=600"
-		MSGSOUND=alien
-	elif [ "${3}" = "1" ]; then
-		PRIORITY="${3}"
-		MSGSOUND=siren
-	elif [ "${3}" != "" ]; then
-		PRIORITY=${3}
-	else
-		PRIORITY=0
-	fi
-	curl -d "token=${PUSHOVER_APP_TOKEN}&user=${PUSHOVER_USER_TOKEN}&message=${MESSAGE}&title=${TITLE}&priority=${PRIORITY}&sound=${MSGSOUND}" https://api.pushover.net/1/messages.json >/dev/null 2>&1
-}
-
 PWO_START(){
 	startup=true
 	while true; do
@@ -54,11 +32,22 @@ PWO_START(){
 			OFFSITE_BATT_RUNTIME=$(echo "${upsinfo}" | grep 'battery.runtime:' | sed 's/.*: //')
 			OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc`
 			OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //')
-			if [ "${startup}" == "true" ]; then
-				SENDNOTICE "OFFSITE POWER MONITOR" "Service starting
+			SENDNOTICE(){
+				TITLE=${1}
+				MESSAGE="${2}
 
-BATTERY: ${OFFSITE_BATT_CAP}'(percent)
-VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
+BATTERY CHARGE: ${OFFSITE_BATT_CAP}'(percent)
+BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins
+AC VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
+
+$(date)"
+				MSGSOUND=Cosmic
+				if [ "${3}" = "1" ]; then PRIORITY="${3}"; MSGSOUND=siren
+				elif [ "${3}" != "" ]; then PRIORITY=${3}; else PRIORITY=0; fi
+				curl -d "token=${PUSHOVER_APP_TOKEN}&user=${PUSHOVER_USER_TOKEN}&message=${MESSAGE}&title=${TITLE}&priority=${PRIORITY}&sound=${MSGSOUND}" https://api.pushover.net/1/messages.json >/dev/null 2>&1
+			}
+			if [ "${startup}" == "true" ]; then
+				SENDNOTICE "OFFSITE POWER MONITOR" "Service starting"
 				startup=false
 			fi
 			
@@ -68,8 +57,9 @@ VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
 						echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - ${OFFSITE_BATT_CAP}% Battery - Offsite Power Restored" >> ${PW_LOGPOWER}
 						SENDNOTICE "OFFSITE POWER" "Power restored! Will wait ${WAIT_TO_POWER_SERVERS}'Mins before turning host(s) back on.
 
-BATTERY: ${OFFSITE_BATT_CAP}'(percent)
-VOLTAGE: ${OFFSITE_VOLTIN}'Volts"	
+BATTERY CHARGE: ${OFFSITE_BATT_CAP}'(percent)
+BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins
+AC VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
 					fi
 					
 					rm -f ${PW_TMPFOLDER}/power.offsite.ac.*
@@ -82,8 +72,9 @@ VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
 						echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - ${OFFSITE_BATT_CAP}% Battery - Powering Hosts ON After Power Outage" >> ${PW_LOGFILE}
 						SENDNOTICE "OFFSITE HOST POWER" "Powering offsite host(s) back on after power outage
 
-BATT CAPACITY: ${OFFSITE_BATT_CAP}'(percent)
-BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins"
+BATTERY CHARGE: ${OFFSITE_BATT_CAP}'(percent)
+BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins
+AC VOLTAGE: ${OFFSITE_VOLTIN}'Volts"
 						[ "$TEST" != "true" ] && ipmitool -I lanplus -H 10.2.1.21 -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power on &
 						rm -f ${PW_TMPFOLDER}/power.offsite.*
 					fi
@@ -97,8 +88,9 @@ BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins"
 					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - ${OFFSITE_BATT_CAP}% Battery - Powering LOW/OFF!" >> ${PW_LOGFILE}
 					SENDNOTICE "OFFSITE POWER - POWER OFF/LOW!!" "Power off or low voltage detected
 
-BATT CAPACITY: ${OFFSITE_BATT_CAP}'(percent)
-BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1
+BATTERY CHARGE: ${OFFSITE_BATT_CAP}'(percent)
+BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins
+AC VOLTAGE: ${OFFSITE_VOLTIN}'Volts" 1
 					touch ${PW_TMPFOLDER}/power.offsite.ac.low
 				fi
 
@@ -106,8 +98,9 @@ BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1
 					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - ${OFFSITE_BATT_CAP}% Battery - Powering Down Hosts!" >> ${PW_LOGFILE}
 					SENDNOTICE "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage
 
-BATT CAPACITY: ${OFFSITE_BATT_CAP}'(percent)
-BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1
+BATTERY CHARGE: ${OFFSITE_BATT_CAP}'(percent)
+BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins
+AC VOLTAGE: ${OFFSITE_VOLTIN}'Volts" 1
 					touch ${PW_TMPFOLDER}/power.offsite.off
 					[ "$TEST" != "true" ] && ssh root@10.2.1.11 /vmfs/volumes/652c94ef-ee49895b-365d-00109b3fea40/.SCRIPTS/esxi-shutdown2.sh &
 				fi