diff --git a/shutdown-test.sh b/shutdown-test.sh
index aba4a6ae..7165b0c8 100644
--- a/shutdown-test.sh
+++ b/shutdown-test.sh
@@ -102,7 +102,6 @@ SHUTDOWN_SERVER2(){
 		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
 			echo 2
 			for ESXIHOST in "${ESXI_HOSTS[@]}"; do
-				echo 3
 				if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ]; then
 					MSG="Stopping iSCSI-PRI VM's on:    ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
 				elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then
@@ -177,7 +176,7 @@ SHUTDOWN_SERVER2(){
 		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
+		if [ "${ESXI_HOST}" != "OFFSITE" ] && ([ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "10.10.2.17" ] || [ ${MN} -eq 1 ]); then
 			for ESXIHOST in "${ESXI_HOSTS[@]}"; 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