diff --git a/powerwall.sh b/powerwall.sh
index b8c3ba23..0e282cf1 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -585,7 +585,9 @@ CHECKPOWER(){
 		# fi
 
 		echo -e "${idsCL[LightCyan]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'amps${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'watts ~ estimate${idsCL[Default]}"
+		average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} 3)
+		average_disp="${idsCL[LightYellow]}			${average}'watts"
+		echo -e "${idsCL[LightCyan]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT_disp}'watts ~ estimate${average_disp}${idsCL[Default]}"
 		echo
 
 		if [ "${SVRRM_VOLT}" != "" ]; then
@@ -598,13 +600,17 @@ CHECKPOWER(){
 		fi
 
 		echo -e "${idsCL[LightCyan]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'amps ~ estimate${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT}'watts ~ estimate${idsCL[Default]}"
+		average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} 3)
+		average_disp="${idsCL[LightYellow]}			${average}'watts"
+		echo -e "${idsCL[LightCyan]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT}'watts ~ estimate${average_disp}${idsCL[Default]}"
 		echo
 
 		echo -e "${idsCL[LightCyan]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'volts${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT_disp}'watts${idsCL[Default]}"
+		average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} 3)
+		average_disp="${idsCL[LightYellow]}			${average}'watts"
+		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT_disp}'watts${average_disp}${idsCL[Default]}"
 		echo
 		
 	fi
@@ -646,7 +652,9 @@ CHECKPOWER(){
 		echo -e "${idsCL[LightCyan]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'volts${idsCL[Default]}"
 		echo
 		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'amps ~ estimate${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'watts ~ estimate${idsCL[Default]}"
+		average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} 3)
+		average_disp="${idsCL[LightYellow]}			${average}'watts"
+		echo -e "${idsCL[LightCyan]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'watts ~ estimate${average_disp}${idsCL[Default]}"
 		echo
 		echo -e "${idsCL[LightCyan]}Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_CAP}%${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME%.*}'Mins${idsCL[Default]}"
@@ -678,8 +686,8 @@ CHECKPOWER(){
 					HOST_WATTS=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_HOST_IDRACS[${SENSOR}]} iso.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.${s} | sed 's/.*: //')
 				# fi
 				[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_WATTS}'watts"
-				average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} 1)
-				average_disp="${idsCL[LightCyan]}			${average}'watts"
+				average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} 3)
+				average_disp="${idsCL[LightYellow]}			${average}'watts"
 				echo -e "${idsCL[LightCyan]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${average_disp}${idsCL[Default]}"
 			fi
 		fi