diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index af8ac40f..b4d90c81 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -353,7 +353,7 @@ CHECKPOWER(){
 	if [ "${PTYPE}" != "power" ]; then
 		DIVIDER . yellow ${PRI_WIDTH}
 		echo -en "${idsCL[Yellow]}ESXi Host Power Information"
-		[ "${avgdays}" != "" ] && echo -e "							--${idsCL[LightYellow]}${avgdays_disp}-Averages---" || echo
+		[ "${avgdays}" != "" ] && echo -e "				--${idsCL[LightYellow]}${avgdays_disp}-Averages---" || echo
 		# echo -en "${idsCL[LightCyan]}	                  Amps        Watts"
 		# [ "${avgdays}" != "" ] && echo -e "		Amps        Watts" || echo
 		DIVIDER . yellow ${PRI_WIDTH}
@@ -420,7 +420,34 @@ CHECKPOWER(){
 					fi
 
 					[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
-					echo -e "${idsCL[White]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}"
+					echo -en "${idsCL[White]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}"
+					
+					if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -ne -2 ] && [ "${SENSOR}" != "iDS-vMS-Host6" ]; then
+						echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
+						# AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both
+						average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both)
+						average_amp=$(echo ${average} | cut -d'~' -f 1)
+						average_watt=$(echo ${average} | cut -d'~' -f 2)
+						average_disp="		${average_amp}'amps - `IDS_NUMBER_FORMAT ${average_watt} 0`'watts"
+						echo -e "${idsCL[White]}${SENSOR}            ${idsCL[Default]}: ${HOST_WATTS_disp}${idsCL[LightYellow]}${average_disp}${idsCL[Default]}"
+						
+						if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
+							AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average_watt}" | bc`
+							AVERAGE_AMPS_MAINSITE=`echo "scale=2; ${AVERAGE_AMPS_MAINSITE}+${average_amp}" | bc`
+						else
+							AVERAGE_WATTS_OFFSITE=`echo "scale=2; ${AVERAGE_WATTS_OFFSITE}+${average_watt}" | bc`
+							AVERAGE_AMPS_OFFSITE=`echo "scale=2; ${AVERAGE_AMPS_OFFSITE}+${average_amp}" | bc`
+						fi
+					else
+						echo -e "${idsCL[Default]}"
+					fi
+					
+					if [ ${HOST_WATTS} -gt 0 ]; then
+						DIVIDER . lightCyan ${PRI_WIDTH}
+						echo -e "${idsCL[LightCyan]}  PS1			 ${idsCL[Default]}: ${idsCL[LightCyan]}${PS1}'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS1V}'volts"
+						echo -e "${idsCL[LightCyan]}  PS2			 ${idsCL[Default]}: ${idsCL[LightCyan]}${PS2}'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS2V}'volts"
+					fi
+					echo -e "${idsCL[Default]}"
 					
 					if [ "${HOST_WATT_SENSORS}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then
 						if [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]; then
@@ -431,29 +458,6 @@ CHECKPOWER(){
 							SENSOR_TOTAL_AMPS_OFFSITE=$(echo "scale=1; ${SENSOR_TOTAL_AMPS_OFFSITE}+${HOST_AMPS}" | bc)
 						fi
 					fi
-					if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -ne -2 ] && [ "${SENSOR}" != "iDS-vMS-Host6" ]; then
-						echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
-						# AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both
-						average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both)
-						average_amp=$(echo ${average} | cut -d'~' -f 1)
-						average_watt=$(echo ${average} | cut -d'~' -f 2)
-						average_disp="${idsCL[LightYellow]}		${average_amp}'amps - `IDS_NUMBER_FORMAT ${average_watt} 0`'watts"
-						echo -e "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
-						if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
-							AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average_watt}" | bc`
-							AVERAGE_AMPS_MAINSITE=`echo "scale=2; ${AVERAGE_AMPS_MAINSITE}+${average_amp}" | bc`
-						else
-							AVERAGE_WATTS_OFFSITE=`echo "scale=2; ${AVERAGE_WATTS_OFFSITE}+${average_watt}" | bc`
-							AVERAGE_AMPS_OFFSITE=`echo "scale=2; ${AVERAGE_AMPS_OFFSITE}+${average_amp}" | bc`
-						fi
-						
-					fi
-					if [ ${HOST_WATTS} -gt 0 ]; then
-						DIVIDER . lightCyan ${PRI_WIDTH}
-						echo -e "${idsCL[LightCyan]}  PS1			 ${idsCL[Default]}: ${idsCL[LightCyan]}${PS1}'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS1V}'volts"
-						echo -e "${idsCL[LightCyan]}  PS2			 ${idsCL[Default]}: ${idsCL[LightCyan]}${PS2}'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS2V}'volts"
-					fi
-					echo -e "${idsCL[Default]}"
 				fi
 			fi
 		done