diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 27d8e748..8ac43e4d 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -206,8 +206,8 @@ CHECKPOWER(){
 				echo -en "\r\033[K"
 			fi
 			# AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -en "${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W ${idsCL[Default]}"
-			[ "${avgdays}" != "" ] && echo -e "	" || echo
+			echo -en "${idsCL[White]}Server Rack              ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'A	`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W"
+			[ "${avgdays}" != "" ] && echo -e "		${APCPDU_AMP_avg}'A	`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W" || echo
 			
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages  ... "
@@ -217,7 +217,8 @@ CHECKPOWER(){
 				echo -en "\r\033[K"
 			fi
 			# AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W ${idsCL[Default]}"
+			echo -en "${idsCL[White]}Network Rack             ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'A	`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W"
+			[ "${avgdays}" != "" ] && echo -e "		${NETRK_AMP_avg}'A	`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W" || echo
 			
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages  ... "
@@ -227,7 +228,8 @@ CHECKPOWER(){
 				echo -en "\r\033[K"
 			fi
 			# AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AIRCON_AMP}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W ${idsCL[Default]}"
+			echo -en "${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AIRCON_AMP}'A	`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W"
+			[ "${avgdays}" != "" ] && echo -e "		${AIRCON_AMP_avg}'A	`IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W" || echo
 			
 			DIVIDER . lightCyan ${PRI_WIDTH}
 			if [ "${avgdays}" != "" ]; then
@@ -241,9 +243,13 @@ CHECKPOWER(){
 				echo -en "\r\033[K"
 			fi
 			# AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Server Room              ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W ${idsCL[Default]}"
+			echo -e "${idsCL[White]}Server Room              ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A	`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
+			[ "${avgdays}" != "" ] && echo -e "		${SVRRM_AMP_avg}'A	`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" || echo
+			
 			# AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			echo -e "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP_WAC}'A	${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W ${idsCL[Default]}"
+			echo -e "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP_WAC}'A	`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W ${idsCL[Default]}"
+			[ "${avgdays}" != "" ] && echo -e "		${SVRRM_AMP_WAC_avg}'A	`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" || echo
+			
 			DIVIDER . lightCyan ${PRI_WIDTH}
 		fi