diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 957baccb..cf0a030c 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -121,9 +121,7 @@ CHECKPOWER(){
 		# echo
 		DIVIDER . lightCyan 75
 		
-		if [ ${REPORT} -eq 0 ]; then
-			[ "${avgdays}" == "" ] && echo -en "${idsCL[Yellow]}Pulling data from 'ServerRoom' ... " || echo -en "${idsCL[Yellow]}Pulling data from 'ServerRoom' and calculating averages  ... "
-		fi
+		[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'ServerRoom' ... "
 
 		# if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then
 			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/.*: //')
@@ -152,38 +150,42 @@ CHECKPOWER(){
 			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc`
 		fi
 		
-		if [ "${avgdays}" != "" ]; then
-			APCPDU_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays} both)
-			APCPDU_AMP_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 1)
-			APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2)
-			NETRK_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays} both)
-			NETRK_AMP_avg=$(echo ${NETRK_avg} | cut -d'~' -f 1)
-			NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
-			SVRRM_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} both)
-			SVRRM_AMP_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 1)
-			SVRRM_WATT_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 2)
-		fi
-		
 		if [ ${REPORT} -eq 0 ]; then
 			echo -en "\r\033[K"
-			
+			if [ "${avgdays}" != "" ]; then
+				echo -en "${idsCL[Yellow]}Calculating ServerRack Averages  ... "
+				APCPDU_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays} both)
+				APCPDU_AMP_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 1)
+				APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2)
+				echo -en "\r\033[K"
+			fi
 			echo -en "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${APCPDU_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
-			
 			echo -en "${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'watts ${idsCL[Default]}~ est"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "		${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
 		
 			DIVIDER . lightCyan 75
-			
+			if [ "${avgdays}" != "" ]; then
+				echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages  ... "
+				NETRK_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays} both)
+				NETRK_AMP_avg=$(echo ${NETRK_avg} | cut -d'~' -f 1)
+				NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
+				echo -en "\r\033[K"
+			fi
 			echo -en "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ est"
-			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${NETRK_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
-			
+			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${NETRK_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 			echo -en "${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'watts ${idsCL[Default]}~ est"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "		${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 0` watts) ${idsCL[Default]}~ est${idsCL[Default]}"
 		
 			DIVIDER . lightCyan 75
 		fi
-		
+		if [ "${avgdays}" != "" ]; then
+			echo -en "${idsCL[Yellow]}Calculating Server Room Total Averages  ... "
+			SVRRM_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} both)
+			SVRRM_AMP_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 1)
+			SVRRM_WATT_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 2)
+			echo -en "\r\033[K"
+		fi
 		echo -e "${idsCL[White]}Server Room Voltage IN   ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTIN}'volts${idsCL[Default]}"
 		echo -e "${idsCL[White]}Server Room Voltage OUT  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTOUT}'volts${idsCL[Default]}"
 		[ ${REPORT} -eq 0 ] && echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}"