diff --git a/powerwall.sh b/powerwall.sh
index b204d955..cf76e8be 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -609,8 +609,10 @@ CHECKPOWER(){
 			echo -en "${idsCL[LightYellow]}	Calculating average ...${idsCL[Default]}"
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]}	`IDS_NUMBER_FORMAT ${average}`'watts"
 			echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
+		else
+			echo -en "	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)"
 		fi
-		echo -e "	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
+		echo -e "${idsCL[Default]}"
 		
 		# echo
 		DIVIDER . lightCyan 75
@@ -631,6 +633,8 @@ CHECKPOWER(){
 			echo -en "${idsCL[LightYellow]} 	Calculating average ...${idsCL[Default]}"
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} 	`IDS_NUMBER_FORMAT ${average}`'watts"
 			echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
+		else
+			echo -en "	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts)"
 		fi		
 		echo -e "${idsCL[Default]}"
 		
@@ -762,8 +766,10 @@ CHECKPOWER(){
 					echo -en "${idsCL[LightYellow]}			Calculating average ...${idsCL[Default]}"
 					average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${average}`'watts"
 					echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
+				elif [ "${HOST_WATTS}" != "0" ]; then
+					echo -en "${idsCL[LightCyan]}	[PS1=${PS1}'A, PS2=${PS2}'A]"
 				fi		
-				[ "${HOST_WATTS}" != "0" ] && echo -e "${idsCL[LightCyan]}	[PS1=${PS1}'A, PS2=${PS2}'A]${idsCL[Default]}" || echo -e "${idsCL[Default]}"
+				echo -e "${idsCL[Default]}"
 			fi
 		fi
 	done