diff --git a/offsite-power-check.sh b/offsite-power-check.sh
index c14b18ea..8db68d4b 100755
--- a/offsite-power-check.sh
+++ b/offsite-power-check.sh
@@ -14,18 +14,19 @@ PW_LOGPOWER=${PW_LOGFOLDER}/log-power
 
 . /opt/idssys/powerwall/settings.conf
 
-[ "${SHUTDOWNSERVERS_AT_LOAD}" == "" ] && SHUTDOWNSERVERS_AT_LOAD=80	#percent
-[ "${WAIT_TO_POWER_SERVERS}" == "" ] && WAIT_TO_POWER_SERVERS=5			#minutes
-[ "${LOG_INTERVAL_NORMAL}" == "" ] && LOG_INTERVAL_NORMAL=60			#minutes
-[ "${LOG_INTERVAL_ABNORMAL}" == "" ] && LOG_INTERVAL_ABNORMAL=30		#seconds
-[ "${LOG_INTERVAL_CHARGING}" == "" ] && LOG_INTERVAL_CHARGING=120		#seconds
+SHUTDOWNSERVERS_AT_LOAD=80		#percent
+SHUTDOWNSERVERS_AFTER=5			#minutes
+WAIT_TO_POWER_SERVERS=5			#minutes
+LOG_INTERVAL_NORMAL=60			#minutes
+LOG_INTERVAL_ABNORMAL=30		#seconds
+LOG_INTERVAL_CHARGING=120		#seconds
 
 PW_OFFSITEHOSTS="10.2.1.11"
 # PW_OFFSITEHOSTS="10.2.1.11 10.2.1.12"
 
 TEST=true  #full
 if [ "$TEST" != "" ]; then
-	SHUTDOWNSERVERS_AT_LOAD=95
+	SHUTDOWNSERVERS_AT_LOAD=70
 	WAIT_TO_POWER_SERVERS=1
 	LOG_INTERVAL_NORMAL=1
 	LOG_INTERVAL_ABNORMAL=1
@@ -112,7 +113,7 @@ $(date)"
 					touch ${PW_TMPFOLDER}/power.offsite.ac.low
 				fi
 
-				if [ ${OFFSITE_BATT_CAP%.*} -lt ${SHUTDOWNSERVERS_AT_LOAD} ] && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then
+				if ([ ${OFFSITE_BATT_CAP%.*} -lt ${SHUTDOWNSERVERS_AT_LOAD} ] || [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge 60 ]) && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then
 					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" 1
 					touch ${PW_TMPFOLDER}/power.offsite.off