diff --git a/defaults.inc b/defaults.inc
index 81d98b8b..2399e9d2 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='2.5.14-12132023'
+VERS='2.5.15-12132023'
 
 noheader=' update service dailytemp confsync '
 HC_CW=60
diff --git a/shutdown-test.sh b/shutdown-test.sh
index cc1ceed0..70e9c9b5 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -125,32 +125,24 @@ SHUTDOWN_SERVER2(){
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 				fi
-				MSG="Enabling maintenance mode 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
-					${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-				else
-					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
-				fi
-				echo
-			done
-			[ "${TEST}" != "true" ] && sleep 10s
-			
-		else
-			for ESXIHOST in "${ESXI_HOSTS[@]}"; do
-				MSG="Enabling maintenance mode 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
-					${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-				else
-					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
-				fi
 			done
 			echo
+		fi
+		
+		for ESXIHOST in "${ESXI_HOSTS[@]}"; do
+			MSG="Enabling maintenance mode 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
+				${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 &
+				echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+			else
+				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
+			fi
+		done
+		echo
+		
+		if [ "${ESXI_HOST}" != "OFFSITE" ] && [ "${ESXI_HOST}" != "ALL" ] && [ "${ESXI_HOST}" != "MAINSITE" ]; then
 			MSG="Starting iSCSI migrations"
 			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}: "
@@ -163,7 +155,6 @@ SHUTDOWN_SERVER2(){
 			echo
 		fi
 		
-		
 		for ESXIHOST in "${ESXI_HOSTS[@]}"; do
 			MSG="Shutting down remaining VM's 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
@@ -184,13 +175,13 @@ SHUTDOWN_SERVER2(){
 				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 &
+						${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 ${ESXIHOST} >/dev/null 2>&1 &
+						${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify ${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 &
+						${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1
 					fi
-					echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 				fi