diff --git a/powerwall.sh b/powerwall.sh
index 61a7e0df..09401cb4 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -581,8 +581,11 @@ CHECKPOWER(){
 
 
 		# if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then
-			SVRRM_VOLT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
-			SVRRM_VOLT=`echo "scale=2; ${SVRRM_VOLT}/10" | bc`
+			SVRRM_VOLTIN=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.2.2.1.3.1.1 | sed 's/.*: //')
+			SVRRM_VOLTIN=`echo "scale=2; ${SVRRM_VOLTIN}/10" | bc`
+			SVRRM_VOLTOUT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
+			SVRRM_VOLTOUT=`echo "scale=2; ${SVRRM_VOLTOUT}/10" | bc`
+			
 			SVRRM_WATT=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
 			SVRRM_AMP=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} 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`
@@ -592,7 +595,7 @@ CHECKPOWER(){
 			APCPDU_AMP=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
 			APCPDU_AMP=`echo "scale=2; ${APCPDU_AMP}/10" | bc`
 			APCPDU_WATT2=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
-			APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
+			APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLTOUT}" | bc`
 		# fi
 
 		echo -e "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}"
@@ -605,13 +608,13 @@ CHECKPOWER(){
 		echo -e "${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ~ estimate${average_disp}	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
 		echo
 
-		if [ "${SVRRM_VOLT}" != "" ]; then
+		if [ "${SVRRM_VOLTOUT}" != "" ]; then
 			if [ "${APCPDU_AMP}" != "" ]; then
 				NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 				NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
 				NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc`
 			fi
-			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc`
+			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc`
 		fi
 
 		echo -e "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ~ estimate${idsCL[Default]}"
@@ -624,7 +627,7 @@ CHECKPOWER(){
 		echo -e "${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2 true`'watts ~ estimate${average_disp}	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts)${idsCL[Default]}"
 		echo
 
-		echo -e "${idsCL[White]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'volts${idsCL[Default]}"
+		echo -e "${idsCL[White]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTOUT}'volts${idsCL[Default]}"
 		echo -e "${idsCL[White]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}"
 		echo -e "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
 		if [ "${avgdays}" != "" ]; then