diff --git a/powerwall.sh b/powerwall.sh
index a1c908e1..fb454c7e 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -519,8 +519,10 @@ GETHOSTPOWER(){
 
 
 CHECKPOWER(){
-	for ESXIHOST in "${!PW_iDRACHOST_SHORTNAMES[@]}"; do
-		GETHOSTPOWER ${ESXIHOST} &
+	for SENSOR in ${PW_SENSOR_ORD[@]}; do
+		if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
+			GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} &
+		fi
 	done
 	
 	INVSTATSINFO=$(curl -s "https://inv1.scity.us/stats.json")
@@ -566,14 +568,16 @@ CHECKPOWER(){
 	echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}A${idsCL[Default]}"
 	echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}"
 	echo
-	for ESXIHOST in "${!PW_iDRACHOST_SHORTNAMES[@]}"; do
-		checked=""
-		until [ "${checked}" != "" ]; do
-			[ -f ${PW_TMPFOLDER}/${ESXIHOST}.hostpower ] && checked=good
-		done
-		watts=$(cat ${PW_TMPFOLDER}/${ESXIHOST}.hostpower)
-		echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${ESXIHOST}]}'     ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
-		rm -f ${PW_TMPFOLDER}/${ESXIHOST}.hostpower
+	for SENSOR in ${PW_SENSOR_ORD[@]}; do
+		if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
+			checked=""
+			until [ "${checked}" != "" ]; do
+				[ -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower ] && checked=good
+			done
+			watts=$(cat ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower)
+			echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${PW_HOST_IDRACS[${SENSOR}]}]}'     ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
+			rm -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower
+		fi
 	done
 		
 	[ "${action}" != "" ] && echo