diff --git a/powerwall.sh b/powerwall.sh
index 2e0c53ab..866e7138 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -357,11 +357,11 @@ SHUTDOWN_SERVERS(){
 
 		
 	if [ "${1}" = "MAIN" ]; then
-		# 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
-		# ssh root@${VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
-		# echo "Done"
+		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
+		ssh root@${VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
+		echo "Done"
 		
 		for ESXIHOST in "${ESXIHOSTS[@]}"; do
 			echo -en "Stopping iSCSI VM's on: ${ESXIHOST} ... "
@@ -423,9 +423,11 @@ SHUTDOWN_SERVERS(){
 	fi
 }
 SHUTDOWN_SERVER(){
-	echo -en "Enabling Maintenance mode and will wait 1min for iSCSI VM's to migrate ... "
+	echo -en "Enabling Maintenance mode and will wait for iSCSI VM's to begin migrating ... "
 	ssh root@${1} 'esxcli system maintenanceMode set -e true -t 0' &
-	sleep 1m
+	ssh root@${VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
+	ssh root@${VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
+	sleep 30s
 	echo "Done"
 	
 	echo -en "Shutting Down VM's on: ${1} ... "