diff --git a/shutdown-test.sh b/shutdown-test.sh
index 8a67c737..f3fb2b76 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -155,19 +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
-			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/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 &
-				echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
-			else
-				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
-			fi
-		done
-		echo
-		
 		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
 			for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do
 				MSG="Waiting for iSCSI VM's to power down on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
@@ -206,6 +193,19 @@ 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
+			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/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 &
+				echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}"
+			else
+				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
+			fi
+		done
+		echo
+		
 		if [ "${2}" != "maintenance" ]; then
 			for ESXIHOST in "${ESXI_HOSTS[@]}"; do
 				MSG="Waiting for VM's, will then shutdown: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"