diff --git a/powerwall.sh b/powerwall.sh
index f9ac0bd7..33b3e214 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -569,15 +569,6 @@ CHECKPOWER(){
 		echo -e "${idsCL[LightCyan]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'V${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Battery Amps Chg/DChg    ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
 		echo
-		
-		if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then
-			SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
-			SVRRM_VOLT=`echo "scale=1; ${SVRRM_VOLT}/10" | bc`
-			SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
-			[[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.1f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
-			SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
-			SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc`
-		fi
 
 		if [ "$(CHECK_HOST 10.10.1.210)" != "false" ]; then
 			APCPDU_AMP=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
@@ -591,7 +582,14 @@ CHECKPOWER(){
 		echo -e "${idsCL[LightCyan]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'W${idsCL[Default]}"
 		echo
 		
-		if [ "${SVRRM_VOLT}" != "" ]; then
+		if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then
+			SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
+			SVRRM_VOLT=`echo "scale=1; ${SVRRM_VOLT}/10" | bc`
+			SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
+			[[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.1f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
+			SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
+			SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc`
+			
 			if [ "${APCPDU_AMP}" != "" ]; then
 				NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 				NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`