diff --git a/powerwall.sh b/powerwall.sh
index 30e6eafb..a7e84d8b 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -541,7 +541,7 @@ CHECKPOWER(){
 	
 	if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then
 		for SENSOR in ${PW_SENSOR_ORD[@]}; do
-			if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
+			if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ] && [[ "${PW_ESXI_HOST_NAMES[${SENSOR}]}" = *"iDS-vMS"* ]]; then
 				GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} &
 			fi
 		done
@@ -616,33 +616,9 @@ CHECKPOWER(){
 		echo
 	fi
 	
-	########
+	echo -e "${idsCL[Cyan]}ESXi Hosts"
+	DIVIDER . cyan 75
 	
-	DIVIDER . yellow 75
-	echo -e "${idsCL[Yellow]}Offsite Power Information"
-	DIVIDER . yellow 75
-	
-	if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then
-		OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //')
-		OFFSITE_VOLTIN=`echo "scale=1; ${OFFSITE_VOLTIN}/10" | bc`
-		OFFSITE_VOLTOUT=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.1.0 | sed 's/.*: //')
-		OFFSITE_VOLTOUT=`echo "scale=1; ${OFFSITE_VOLTOUT}/10" | bc`	
-		OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //')
-		OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | bc`
-		OFFSITE_WATTS=`echo "scale=1; ${OFFSITE_LOAD}*900" | bc`
-		OFFSITE_AMPS=`echo "scale=1; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc`	
-		
-	fi
-	
-	echo -e "${idsCL[LightCyan]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'V${idsCL[Default]}"
-	echo -e "${idsCL[LightCyan]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'V${idsCL[Default]}"
-	echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'A ~ estimate${idsCL[Default]}"
-	echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'W ~ estimate${idsCL[Default]}"
-	echo	
-	
-	
-	########
-		
 	if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then
 		finalcheck=""
 		until [ "${finalcheck}" != "" ]; do
@@ -670,8 +646,66 @@ CHECKPOWER(){
 			done
 			sleep 0.25
 		done
+	fi	
+	
+	
+	########
+	
+	DIVIDER . yellow 75
+	echo -e "${idsCL[Yellow]}Offsite Power Information"
+	DIVIDER . yellow 75
+	
+	if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then
+		OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //')
+		OFFSITE_VOLTIN=`echo "scale=1; ${OFFSITE_VOLTIN}/10" | bc`
+		OFFSITE_VOLTOUT=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.1.0 | sed 's/.*: //')
+		OFFSITE_VOLTOUT=`echo "scale=1; ${OFFSITE_VOLTOUT}/10" | bc`	
+		OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //')
+		OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | bc`
+		OFFSITE_WATTS=`echo "scale=1; ${OFFSITE_LOAD}*900" | bc`
+		OFFSITE_AMPS=`echo "scale=1; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc`	
+		
 	fi
 	
+	echo -e "${idsCL[LightCyan]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'V${idsCL[Default]}"
+	echo -e "${idsCL[LightCyan]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'V${idsCL[Default]}"
+	echo
+	echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'A ~ estimate${idsCL[Default]}"
+	echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'W ~ estimate${idsCL[Default]}"
+	echo	
+	
+	
+	########
+		
+	# if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then
+	# 	finalcheck=""
+	# 	until [ "${finalcheck}" != "" ]; do
+	# 		for hostfile in ${PW_TMPFOLDER}/*.hostpower; do
+	# 			if [ -f ${hostfile} ] && [ "${hostfile}" != "${PW_TMPFOLDER}/*.hostpower" ]; then
+	# 				host=${hostfile%.*}; host=${host##*/}
+	# 				if [ "${host}" != "*" ] && [ "${host}" != "done" ]; then
+	# 					watts=$(cat ${hostfile})
+	# 					if [ "${watts}" == "down" ]; then
+	# 						hostpower="${idsCL[LightRed]}Host Offline"
+	# 					elif [ "${watts}" == "0" ]; then
+	# 						hostpower="${idsCL[Default]}n/a"
+	# 					else
+	# 						[[ "${watts}" == *"."* ]] && [[ "${watts}" != *".0"* ]] && watts=`printf "%'.1f\n" ${watts}` || watts=`printf "%'.0f\n" ${watts}`
+	# 						hostpower="${idsCL[Green]}${watts}'W"
+	# 					fi
+	# 					echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${host}]}'     ${idsCL[Default]}: ${hostpower}${idsCL[Default]}"
+	# 					mv ${hostfile} ${hostfile}.done
+	#
+	# 				elif [ "${host}" == "done" ]; then
+	# 					finalcheck=done
+	# 					rm -f ${PW_TMPFOLDER}/*.hostpower*
+	# 				fi
+	# 			fi
+	# 		done
+	# 		sleep 0.25
+	# 	done
+	# fi
+	
 	end=`date +%s`; runtime=$((end-start)); echo -e "\nruntime: ${runtime}"
 	[ "${action}" != "" ] && echo
 }