diff --git a/powerwall.sh b/powerwall.sh
index 0d05e78f..5878c647 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -154,6 +154,7 @@ Previous Temp: ${last_temp[${SENSOR}]}'F"
 						SENDNOTICE "${SENSOR} TEMP NORMAL" "($datetime) Service Startup
 NORMAL TEMP: ${temp_f}'F"
 						echo -e "($datetime) - ${SENSOR} - ${temp_f}'F - Service Startup - NORMAL TEMP" >> ${logtemp}
+						[[ -f $FOLDER/shutdown.* ]] && rm -f ${FOLDER}/shutdown.*
 					fi
 					last_temp[${SENSOR}]=1
 					[ $relog -eq 1 ] && echo "($datetime) - ${SENSOR} - ${temp_f}F - Normal Temp" >> ${logtemp}
@@ -344,7 +345,6 @@ SHUTDOWN_CRIT(){
 }
 
 SHUTDOWN_SERVERS(){
-	touch $FOLDER/shutdown
 	
 	# HOSTS=${1}HOSTS[@]
 	# for ESXIHOST in "${!HOSTS}"; do
@@ -357,6 +357,7 @@ SHUTDOWN_SERVERS(){
 
 		
 	if [ "${1}" = "MAIN" ]; then
+		touch $FOLDER/shutdown.main
 		echo -en "Disabling CLS in vCenter ... "
 		ssh root@${VCENTERHOST} "sed -i '/<domain-c1001>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1
 		ssh root@${VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
@@ -398,6 +399,9 @@ SHUTDOWN_SERVERS(){
 		done
 		
 	elif [ "${1}" = "SYS" ]; then
+		touch $FOLDER/shutdown.sys
+		[ ! -f $FOLDER/shutdown.main ] && SHUTDOWN_SERVERS MAIN
+		
 		for ESXIHOST in "${SYSHOSTS[@]}"; do
 			echo -en "Shutting Down VM's on: ${ESXIHOST} ... "
 			${FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1