diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 1bc9fc01..84b3240f 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -141,6 +141,15 @@ CHECKPOWER(){
 			SVRRM_WATT=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
 			SVRRM_AMP=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
 			SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc`
+			
+			AC_INFO=$(curl -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps')
+			AC_AMP=$(echo "${AC_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
+			AC_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AC_AMP}/1000" | bc -l) 2)
+			AC_WATT=$(echo "${AC_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
+			AC_WATT=$(ROUND_NUMBER $(echo "scale=3; ${AC_WATT}/10" | bc -l) 2)
+			
+			SVRRM_AMP=$(expr ${SVRRM_AMP} + ${AC_AMP})
+			SVRRM_WATT=$(expr ${SVRRM_WATT} + ${AC_WATT})
 		# fi
 		#
 		# if [ "$(CHECK_HOST ${PW_APCPDU_IP})" != "false" ]; then
@@ -187,22 +196,13 @@ CHECKPOWER(){
 			[ "${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 ${PRI_WIDTH}
-			[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data for 'Air Conditioner' ... "
-			AC_INFO=$(curl -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps')
-			AC_AMP=$(echo "${AC_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
-			AC_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AC_AMP}/1000" | bc -l) 2)
-			AC_WATT=$(echo "${AC_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
-			AC_WATT=$(ROUND_NUMBER $(echo "scale=3; ${AC_WATT}/10" | bc -l) 2)
-			
 			# if [ "${avgdays}" != "" ]; then
-			# 	[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
 			# 	echo -en "${idsCL[Yellow]}Calculating Air Conidtioner 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
-			[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
 			echo -en "${idsCL[White]}Air Conditioner Amps     ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AC_AMP}`'amps ${idsCL[Default]}"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${AC_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 			echo -en "${idsCL[White]}Air Conditioner Wattage  ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AC_WATT} 0`'watts ${idsCL[Default]}"
@@ -220,10 +220,8 @@ CHECKPOWER(){
 		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]}"
-		SVRRM_AMP=$(expr ${SVRRM_AMP} + ${AC_AMP})
 		echo -en "${idsCL[White]}Server Room Amps         ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps"
 		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${SVRRM_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
-		SVRRM_WATT=$(expr ${SVRRM_WATT} + ${AC_WATT})
 		echo -en "${idsCL[White]}Server Room Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'watts"
 		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 		[ ${REPORT} -eq 0 ] && echo