diff --git a/powerwall.sh b/powerwall.sh
index ce3ca413..f2e0de7e 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1475,24 +1475,30 @@ SHUTDOWN_SERVER(){
 		fi
 		
 		if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ]; then
+			MSG="Waiting for iSCSI VM's to power down"
+			c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
+			echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 			for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do
-				MSG="Waiting for iSCSI VM's to power down on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
-				c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
-				echo -en "${idsCL[White]}${MSG//${PW_ESXI_HOST_NAMES[${ESXIHOST}]}/${idsCL[LightCyan]}${PW_ESXI_HOST_NAMES[${ESXIHOST}]}}${idsCL[White]}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
-					if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ]; then
-						${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
-					elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then
-						${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
-					elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
-						${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
-					fi
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-				else
-					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
+					VERIFY_ISCSI_VM_DOWN &
 				fi
 			done
-		
+			if [ "${TEST}" != "true" ]; then
+				nc_count=0
+				until [ ${nc_count} -eq ${#PW_MAINSITEHOSTS[@]} ]; do
+					for iscsistatus in ${PW_TMPFOLDER}/verify.iscsi.*.done; do
+						NTS=$(grep -oP '(?<=iscsi.).*?(?=.done)' <<< "${iscsistatus}")
+						if [ "${NTS}" != "*" ]; then
+							rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.done
+							((nc_count++))
+						fi
+					done
+				done
+				echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+			else
+				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
+			fi
+					
 			MSG="Shutting down iSCSI-Server(s)"
 			c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
 			echo -en "${idsCL[White]}${MSG}${MSG_SPC}: "