diff --git a/defaults.inc b/defaults.inc
index 77cda653..4068fde0 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PW_VERS='2.10.11-06032025'
+PW_VERS='2.10.12-06032025'
 
 noheader=' update service dailytemp confsync -r -report test '
 
@@ -13,6 +13,8 @@ NM_FOLDER='/opt/idssys/nodemgmt'
 NM_TMPFOLDER=${NM_FOLDER}/.tmp
 [ -f ${NM_FOLDER}/conf/defaults.local.inc ] && source ${NM_FOLDER}/defaults.inc
 
+SSHCMD='ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1'
+
 [ "${TESTMODE_ENABLE^^}" == "TRUE" ] && TESTMODE=1 || TESTMODE=0
 
 PW_FOLDER='/opt/idssys/powerwall'
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index facac202..08766edb 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -447,11 +447,7 @@ CHECKPOWER(){
 		
 		[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Offsite' ... "
 	
-		if [ "${PW_OFFSITE_MONITOR}" = "$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" ]; then
-			upsinfo=$(upsc offsite-ups 2>&1)
-		else
-			upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_OFFSITE_MONITOR} 'upsc offsite-ups' 2>&1)
-		fi
+		[ "${PW_OFFSITE_MONITOR}" == "${IP}" ] && upsinfo=$(upsc offsite-ups 2>&1) || upsinfo=$(${SSHCMD} root@${PW_OFFSITE_MONITOR} 'upsc offsite-ups' 2>&1)
 		if [ "$(echo "${upsinfo}" | grep 'input.voltage:')" != "" ]; then
 			OFFSITE_STATUS=$(echo "${upsinfo}" | grep 'ups.status:' | sed 's/.*: //')
 			[ "${PW_OFFSITE_UPS_CODES[${OFFSITE_STATUS}]}" != "" ] && OFFSITE_STATUS=${PW_OFFSITE_UPS_CODES[${OFFSITE_STATUS}]} || OFFSITE_STATUS=${OFFSITE_STATUS}
@@ -1008,8 +1004,7 @@ OFFSITE_CHECKPOWER_SERVICE(){
 			TESTMSG=""
 		fi
 				
-		# upsinfo=$(upsc offsite-ups)
-		upsinfo=$(upsc offsite-ups 2>&1)
+		[ "${PW_OFFSITE_MONITOR}" == "${IP}" ] && upsinfo=$(upsc offsite-ups 2>&1) || upsinfo=$(${SSHCMD} root@${PW_OFFSITE_MONITOR} 'upsc offsite-ups' 2>&1)
 		echo "HERE1: $upsinfo"
 		if [ "$(echo "${upsinfo}" | grep 'input.voltage:' | sed 's/.*: //')" != "" ]; then
 			rm -f ${PW_TMPFOLDER}/power.offsite.ups.losscomm
@@ -1288,11 +1283,7 @@ POWERLOGGER_SERVICE(){
 			fi
 			
 		
-			if [ "${PW_OFFSITE_MONITOR}" = "$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" ]; then
-				upsinfo=$(upsc offsite-ups 2>&1)
-			else
-				upsinfo=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_OFFSITE_MONITOR} 'upsc offsite-ups' 2>&1)
-			fi
+			[ "${PW_OFFSITE_MONITOR}" == "${IP}" ] && upsinfo=$(upsc offsite-ups 2>&1) || upsinfo=$(${SSHCMD} root@${PW_OFFSITE_MONITOR} 'upsc offsite-ups' 2>&1)
 			if [ "$(echo "${upsinfo}" | grep 'input.voltage:')" != "" ]; then
 				OFFSITE_VOLTOUT=$(echo "${upsinfo}" | grep 'output.voltage:' | sed 's/.*: //')
 				OFFSITE_LOAD=$(echo "${upsinfo}" | grep 'ups.load:' | sed 's/.*: //')
diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 47973559..e2dfbcbe 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -3,7 +3,7 @@ GET_HOST_FANSPEED(){
 		FanSpeed=$(cat ${PW_TMPFOLDER}/.lastfancheck/${PW_ESXI_HOST_NAMES[${1}]})
 	else
 		[[ "${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${1}]}]}" = "10.6."* ]] && ESXI_PASS=${PW_ESXI_PASS_KP} || ESXI_PASS=${PW_ESXI_PASS}
-		vHOSTFAN=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${1}]}]} -u ${PW_ESXI_USER} -p "'${ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
+		vHOSTFAN=$(${SSHCMD} root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${1}]}]} -u ${PW_ESXI_USER} -p "'${ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
 		if [ "$(echo ${vHOSTFAN} | awk '/ / {print $4}' | sed -e 's/%//g')" == "RPM" ]; then
  			FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $9}' | sed -e 's/%//g')
  		else
@@ -13,7 +13,7 @@ GET_HOST_FANSPEED(){
 	echo ${FanSpeed} > ${PW_TMPFOLDER}/.local.fanspeed.${PW_ESXI_HOST_NAMES[${1}]}.${2}
 }
 START_POWERWALL_FAN(){
-	PWCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS['Powerwall-FAN']}"
+	PWCMD="${SSHCMD} root@${PW_REMOTE_SENSORS['Powerwall-FAN']}"
 	${PWCMD} pwmconfig &
 	sleep 4s
 	${PWCMD} killall pwmconfig >/dev/null 2>&1
@@ -670,7 +670,7 @@ CHECKTEMP(){
 				
 				
 				if [ ${drives} -eq 1 ]; then
-					ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${vHOSTIP} 'wget -qO- https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/ESXi-GetPercDriveTemps.sh | sh'
+					${SSHCMD} root@${vHOSTIP} 'wget -qO- https://git.schroedercity.com/voltron/Misc-Scripts/raw/branch/master/ESXi-GetPercDriveTemps.sh | sh'
 				fi
 				
 				
@@ -732,12 +732,12 @@ CHECKTEMPSENSOR(){
 		
 	elif [ "${PW_SENSOR_TYPE[${1}]}" == "system" ]; then
 		if [[ "${1}" = *"CPU"* ]]; then
-			if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} vcgencmd measure_temp) ; then TIMEOUT=1; fi
+			if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${1}]} vcgencmd measure_temp) ; then TIMEOUT=1; fi
 			if [ "${temp_c}" != "" ]; then
 				temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
 			fi
 		elif [[ "${1}" = *"FAN"* ]]; then
-			if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} cat ${PW_FANINPUT}) ; then TIMEOUT=1; fi
+			if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${1}]} cat ${PW_FANINPUT}) ; then TIMEOUT=1; fi
 		fi
 
 	elif [ "${PW_SENSOR_TYPE[${1}]}" == "esxi" ]; then
@@ -750,13 +750,13 @@ CHECKTEMPSENSOR(){
 				TIMEOUT=1
 			fi
 		else
-			 if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} "/opt/idssys/defaults/get-data.sh cpu-usage") ; then
+			 if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${1}]} "/opt/idssys/defaults/get-data.sh cpu-usage") ; then
 				TIMEOUT=1 
 			 fi
 		fi
 		
 	elif [ "${PW_SENSOR_TYPE[${1}]}" == "ds18b20" ]; then
-		if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID[${1}]}/w1_slave | tail -n1 | cut -d "=" -f2) ; then TIMEOUT=1; fi
+		if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${1}]} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID[${1}]}/w1_slave | tail -n1 | cut -d "=" -f2) ; then TIMEOUT=1; fi
 		[ "${temp_c}" != "" ] && temp_c=$(echo "scale=2; ${temp_c}/1000" | bc)
 		
 	fi
@@ -936,8 +936,8 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 			# if [ ! -f ${PW_TMPFOLDER}/${SENSORa}.down ] && ([ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa} ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${SENSORa})) -ge 60 ]); then
 			if [ ! -f ${PW_TMPFOLDER}/${SENSORa}.down ]; then
 				# vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
-				vHOSTFAN=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
-				[ "${vHOSTFAN}" = "" ] && vHOSTFAN=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)
+				vHOSTFAN=$(${SSHCMD} root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${ESXI_PASS}'" getsensorinfo | grep "System Board Fan3" 2>&1)
+				[ "${vHOSTFAN}" = "" ] && vHOSTFAN=$(${SSHCMD} root@${PW_RACADM_ACCESS} racadm -r ${PW_HOST_IDRACS[${SENSORa}]} -u ${PW_ESXI_USER} -p "'${ESXI_PASS}'" getsensorinfo | grep "System Board Fan1" 2>&1)
 				if [ "${vHOSTFAN}" != "" ]; then
 					# FanSpeed=`echo "scale=2; ${vHOSTFAN}/21200" | bc`; FanSpeed=$(ROUND_NUMBER `echo "scale=0; ${FanSpeed}*100" | bc | sed -e 's/.00//g'` 0)
 					if [ "$(echo ${vHOSTFAN} | awk '/ / {print $4}' | sed -e 's/%//g')" == "RPM" ]; then
@@ -1004,12 +1004,12 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 				
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ]; then
 					if [[ "${SENSOR}" = *"CPU"* ]]; then
-						if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSOR}]} vcgencmd measure_temp) ; then TIMEOUT=1; fi
+						if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${SENSOR}]} vcgencmd measure_temp) ; then TIMEOUT=1; fi
 						if [ "${temp_c}" != "" ]; then
 							temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
 						fi
 					elif [[ "${SENSOR}" = *"FAN"* ]]; then
-						if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSOR}]} cat ${PW_FANINPUT}) ; then TIMEOUT=1; fi
+						if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${SENSOR}]} cat ${PW_FANINPUT}) ; then TIMEOUT=1; fi
 						if [ "${SENSOR}" == "Powerwall-FAN" ] && [ ${temp_c} -lt 1500 ]; then
 							START_POWERWALL_FAN  >/dev/null 2>&1 &
 						fi
@@ -1034,12 +1034,12 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 					if [ "${SENSORa}" == "Powerwall-CPU-Usage" ]; then
 						temp_c=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g')
 					else
-						temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} "/opt/idssys/defaults/get-data.sh cpu-usage")
+						temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${SENSORa}]} "/opt/idssys/defaults/get-data.sh cpu-usage")
 					fi
 					temp_h=''
 					
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "ds18b20" ]; then
-					if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID[${SENSORa}]}/w1_slave | tail -n1 | cut -d "=" -f2) ; then TIMEOUT=1; fi
+					if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${SENSORa}]} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID[${SENSORa}]}/w1_slave | tail -n1 | cut -d "=" -f2) ; then TIMEOUT=1; fi
 					[ "${temp_c}" != "" ] && temp_c=$(echo "scale=2; ${temp_c}/1000" | bc)
 					temp_h=''
 					
@@ -1656,7 +1656,7 @@ SENDTEMP(){
 					fi
 					
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "remotesystem" ]; then
-					temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} vcgencmd measure_temp)
+					temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${SENSORa}]} vcgencmd measure_temp)
 					if [ "${temp_c}" != "" ]; then
 						temp_c=${temp_c%\'*}
 						temp_c=${temp_c#*=}
@@ -1670,11 +1670,11 @@ SENDTEMP(){
 					if [ "${SENSORa}" == "Powerwall-CPU-Usage" ]; then
 						temp_c=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g')
 					else
-						temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} "/opt/idssys/defaults/get-data.sh cpu-usage")
+						temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${SENSORa}]} "/opt/idssys/defaults/get-data.sh cpu-usage")
 					fi
 					
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "ds18b20" ]; then
-					if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID[${SENSORa}]}/w1_slave | tail -n1 | cut -d "=" -f2) ; then TIMEOUT=1; fi
+					if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${SENSORa}]} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID[${SENSORa}]}/w1_slave | tail -n1 | cut -d "=" -f2) ; then TIMEOUT=1; fi
 					[ "${temp_c}" != "" ] && temp_c=$(echo "scale=2; ${temp_c}/1000" | bc)
 					
 				else
diff --git a/powerwall.sh b/powerwall.sh
index 41de2256..c001eb5d 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -134,13 +134,13 @@ SHUTDOWN_CRIT(){
 		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - CRITICAL TEMP - OctoPi System shutting down" >> ${PW_LOGFOLDER}/log-temp-${1}
 		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${1} TEMP CRITICAL - OctoPi System shutting down" >> ${PW_LOGFILE}
 		sleep 1s
-		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} /sbin/poweroff
+		${SSHCMD} root@${PW_REMOTE_SENSORS[${1}]} /sbin/poweroff
 		
 	elif [ "${1}" == "OctoPi-CPU-Usage" ]; then
 		SENDNOTICE "${1} USAGE CRITICAL" "OctoPi System rebooting" 1
 		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - CRITICAL USAGE - OctoPi System rebooting" >> ${PW_LOGFOLDER}/log-temp-${1}
 		echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${1} USAGE CRITICAL - OctoPi System rebooting" >> ${PW_LOGFILE}
-		ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} /sbin/reboot
+		${SSHCMD} root@${PW_REMOTE_SENSORS[${1}]} /sbin/reboot
 	fi
 }
 
@@ -170,16 +170,16 @@ MAINT_MODE_VERIFY_SHUTDOWN(){
 	MaintMode=""
 	until [ "${MaintMode}" == "Enabled" ]; do
 		sleep 3s
-		MaintMode=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${ESXIHOST} 'esxcli system maintenanceMode get')
+		MaintMode=$(${SSHCMD} root@${ESXIHOST} 'esxcli system maintenanceMode get')
 	done
 	
 	rm -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.*
 	touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.disable
 	# touch ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.down
 	
-	ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Power-Monitor script initiated system shutdown"'
+	${SSHCMD} root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Power-Monitor script initiated system shutdown"'
 	sleep 8.75s
-	ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0'
+	${SSHCMD} root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0'
 }
 
 SHUTDOWN_SERVER(){
@@ -245,7 +245,7 @@ SHUTDOWN_SERVER(){
 			[[ "${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]}" = "10.6."* ]] && ESXI_PASS=${PW_ESXI_PASS_KP} || ESXI_PASS=${PW_ESXI_PASS}
 			if [ "${TEST^^}" != "TRUE" ] && [ "${TEST_DONOT_SHUTDOWN^^}" != "TRUE" ]; then
 				if [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ]; then
-					ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${ESXIHOST} "/vmfs/volumes/ESXi-Vault (Fileserver)/!SCRIPTS/esxidown/async.sh"
+					${SSHCMD} root@${ESXIHOST} "/vmfs/volumes/ESXi-Vault (Fileserver)/!SCRIPTS/esxidown/async.sh"
 					echo -e "${idsCL[Green]}Command sent${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}Host Offline${idsCL[Default]}"
@@ -317,7 +317,7 @@ SHUTDOWN_SERVER(){
 				# 	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}: "
 				# 	if [ ${TESTMODE} -eq 0 ]; then
-				# 		run=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "sed -i '/<domain-c105105>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
+				# 		run=$(${SSHCMD} root@${PW_VCENTERHOST} "sed -i '/<domain-c105105>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
 				# 		echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 				# 		touch ${PW_TMPFOLDER}/shutdown.cls.offsite
 				# 	else
@@ -329,7 +329,7 @@ SHUTDOWN_SERVER(){
 					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}: "
 					if [ ${TESTMODE} -eq 0 ]; then
-						run=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_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)
+						run=$(${SSHCMD} root@${PW_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)
 						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 						touch ${PW_TMPFOLDER}/shutdown.cls.mainsite
 					else
@@ -340,7 +340,7 @@ SHUTDOWN_SERVER(){
 				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}: "
 				if [ ${TESTMODE} -eq 0 ]; then
-					ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1 && service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null & 2>&1 &
+					${SSHCMD} root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1 && service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null & 2>&1 &
 					echo -e "${idsCL[Green]}Continuing in background${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
@@ -397,7 +397,7 @@ SHUTDOWN_SERVER(){
 							${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 >/dev/null 2>&1
 						fi
 						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-						# if [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ] && [ "$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${ESXIHOST} 'esxcli system maintenanceMode get')" != "Enabled" ]; then
+						# if [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ] && [ "$(${SSHCMD} root@${ESXIHOST} 'esxcli system maintenanceMode get')" != "Enabled" ]; then
 							# VERIFY_ISCSI_VM_DOWN "${ESXI_HOST}" &
 						# else
 						# 	touch ${PW_TMPFOLDER}/verify.iscsi.${ESXIHOST}.done