diff --git a/defaults.inc b/defaults.inc
index 0619c08a..c3e5ae71 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.8.7-11172024'
+VERS='2.8.8-11202024'
 
 noheader=' update service dailytemp confsync -r -report test '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 493dea94..3efa8ae6 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -1273,13 +1273,13 @@ HOSTPOWER(){
 			fi
 			echo -e "${idsCL[Default]}"
 			
-			echo "HERE: [ ${idracip} = ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${PW_ISCSI-PRI_HOST}]}]} ]"
-			if [ "${idracip}" = "${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${PW_ISCSI-PRI_HOST}]}]}" ] && [ "${2^^}" = "OFF" ]; then
+			echo "HERE: [ ${idracip} = ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${PW_ISCSI_PRI_HOST}]}]} ]"
+			if [ "${idracip}" = "${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${PW_ISCSI_PRI_HOST}]}]}" ] && [ "${2^^}" = "OFF" ]; then
 				MSG="Powering OFF the SAS Enclosure"
 				c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
 				echo -en "${idsCL[LightCyan]}${MSG}${MSG_SPC}: "
 				if [ "${TEST}" != "true" ]; then
-					if [ "$(CHECK_HOST ${PW_ISCSI-PRI_HOST})" = "false" ]; then
+					if [ "$(CHECK_HOST ${PW_ISCSI_PRI_HOST})" = "false" ]; then
 						run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2 >/dev/null 2>&1)
 						sleep 3s
 						echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"
diff --git a/powerwall.sh b/powerwall.sh
index 0baa2cca..09d6566d 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -260,10 +260,10 @@ SHUTDOWN_SERVER(){
 			fi
 		fi
 		
-		if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
-			if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
+		if [ "${ESXI_HOST}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${ESXI_HOST}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
+			if [ "${ESXI_HOST}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
 				MSG="Stopping all iSCSI-PRI VM's"
-			elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
+			elif [ "${ESXI_HOST}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
 				MSG="Stopping all iSCSI-SYS VM's"
 			elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
 				MSG="Stopping all iSCSI VM's"
@@ -271,9 +271,9 @@ 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}${idsCL[White]}${MSG_SPC}: "
 			if [ "${TEST}" != "true" ]; then
-				if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
+				if [ "${ESXI_HOST}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
 					${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 >/dev/null 2>&1 &
-				elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
+				elif [ "${ESXI_HOST}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
 					${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 >/dev/null 2>&1 &
 				elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
 					${PW_FOLDER}/esxi-scripts/iscsi-all-vm-shutdown.ps1 >/dev/null 2>&1 &
@@ -356,15 +356,15 @@ SHUTDOWN_SERVER(){
 			echo
 		fi
 		
-		if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
+		if [ "${ESXI_HOST}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${ESXI_HOST}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
 			MSG="Waiting for iSCSI VM's to power down"
 			c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done
 			echo -en "${idsCL[White]}${MSG}${idsCL[White]}${MSG_SPC}: "
 			# for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do
 				if [ "${TEST}" != "true" ]; then
-					if [ "${1}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${1}" == "MAIN" ]; then
+					if [ "${1}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${1}" == "MAIN" ]; then
 						${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 >/dev/null 2>&1
-					elif [ "${1}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${1}" == "SYS" ]; then
+					elif [ "${1}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${1}" == "SYS" ]; then
 						${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 >/dev/null 2>&1
 					elif [ "${1}" == "MAINSITE" ] || [ "${1}" == "ALL" ]; then
 						${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 >/dev/null 2>&1
@@ -390,9 +390,9 @@ SHUTDOWN_SERVER(){
 			# 	echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
 			# fi
 			
-			if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
+			if [ "${ESXI_HOST}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
 				MSG="Shutting down iSCSI-PRI Server"
-			elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
+			elif [ "${ESXI_HOST}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
 				MSG="Shutting down iSCSI-SYS Server"
 			elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
 				MSG="Shutting down both iSCSI-PRI & iSCSI-SYS Servers"
@@ -400,13 +400,13 @@ 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 [ "${TEST}" != "true" ]; then
-				if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
-					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-PRI_HOST} >/dev/null 2>&1 &
-				elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
-					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-SYS_HOST} >/dev/null 2>&1 &
+				if [ "${ESXI_HOST}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then
+					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI_PRI_HOST} >/dev/null 2>&1 &
+				elif [ "${ESXI_HOST}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then
+					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI_SYS_HOST} >/dev/null 2>&1 &
 				elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then
-					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-PRI_HOST} >/dev/null 2>&1 &
-					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-SYS_HOST} >/dev/null 2>&1 &
+					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI_PRI_HOST} >/dev/null 2>&1 &
+					${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI_SYS_HOST} >/dev/null 2>&1 &
 				fi
 				echo -e "${idsCL[Green]}Command sent${idsCL[Default]}"
 			else
@@ -499,9 +499,9 @@ SHUTDOWN_SERVER(){
 }
 
 VERIFY_ISCSI_VM_DOWN(){
-	if [ "${1}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${1}" == "MAIN" ]; then
+	if [ "${1}" == "${PW_ISCSI_PRI_HOST}" ] || [ "${1}" == "MAIN" ]; then
 		${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 >/dev/null 2>&1
-	elif [ "${1}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${1}" == "SYS" ]; then
+	elif [ "${1}" == "${PW_ISCSI_SYS_HOST}" ] || [ "${1}" == "SYS" ]; then
 		${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 >/dev/null 2>&1
 	elif [ "${1}" == "MAINSITE" ] || [ "${1}" == "ALL" ]; then
 		${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 >/dev/null 2>&1