diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 14eafb5f..d3d6dfea 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -204,7 +204,7 @@ CHECKPOWER(){
 			MSG="${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W"
 			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
-				echo -en "${idsCL[Yellow]}	Calculating NetworkRack Averages  ... "
+				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)
@@ -220,7 +220,7 @@ CHECKPOWER(){
 			MSG="${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W"
 			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
-				echo -en "${idsCL[Yellow]}	Calculating ServerRack Averages  ... "
+				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)
@@ -238,7 +238,7 @@ CHECKPOWER(){
 			MSG="${idsCL[LightCyan]}Equipment Subtotal       ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
 			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
-				echo -en "${idsCL[Yellow]}	Calculating Server Room Total Averages  ... "
+				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)
@@ -256,7 +256,7 @@ CHECKPOWER(){
 			MSG="${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W"
 			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
-				echo -en "${idsCL[Yellow]}	Calculating Air Conidtioner Averages  ... "
+				echo -en "${idsCL[Yellow]}	Calculating Air Conidtioner Averages ... "
 				AIRCON_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ServerRoom-AC']} ${avgdays} both)
 				AIRCON_AMP_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 1)
 				AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2)
@@ -274,7 +274,7 @@ CHECKPOWER(){
 			MSG="${idsCL[LightCyan]}Server Room Total w/AIR  ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
 			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
-				echo -en "${idsCL[Yellow]}	Calculating Server Room w/AIR Total Averages  ... "
+				echo -en "${idsCL[Yellow]}	Calculating Server Room w/AIR Total Averages ... "
 				SVRRM_WAC_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total-wac']} ${avgdays} both)
 				SVRRM_AMP_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 1)
 				SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2)
@@ -341,8 +341,21 @@ CHECKPOWER(){
 			IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS
 			AD1="${PW_MISCSENSOR_DESC[${mSENSOR}]}"; c=0; spc1=''; spca=`expr 25 - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done
 			AD2=$(IDS_NUMBER_FORMAT ${AMP} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done
-			AD3=$(IDS_NUMBER_FORMAT ${WATT} 2 yes); c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
-			echo -e "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W${spc3}${VOLT}'V${idsCL[Default]}"
+			[ "${avgdays}" == "" ] && AD3=$(IDS_NUMBER_FORMAT ${WATT} 2 yes); c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
+			echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
+			if [ "${avgdays}" == "" ]; then
+				echo -e "${spc3}${VOLT}'V${idsCL[Default]}"
+			else
+				echo -en "${idsCL[Yellow]}	Calculating ${avgdays_disp} Average ... "
+				avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both)
+				AMP_avg=$(echo ${avg} | cut -d'~' -f 1)
+				WATT_avg=$(echo ${avg} | cut -d'~' -f 2)
+				echo -en "\r\033[K"
+				echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
+				
+				AD=$(IDS_NUMBER_FORMAT ${AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+				echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${WATT_avg} 0`'W"
+			fi
 		done
 		
 		DIVIDER . lightCyan ${PRI_WIDTH}
@@ -352,7 +365,7 @@ CHECKPOWER(){
 		AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMPS} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 		echo -en "${idsCL[White]}Offsite Server Room      ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'W"
 		if [ "${avgdays}" != "" ]; then
-			echo -en "${idsCL[Yellow]}	Calculating Offsite Server Room Total Averages  ... "
+			echo -en "${idsCL[Yellow]}	Calculating Offsite Server Room Total Averages ... "
 			OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both)
 			OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1)
 			OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2)