diff --git a/powerwall.sh b/powerwall.sh
index f3735165..a38d528e 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -761,7 +761,10 @@ CHECKPOWER(){
 							fi
 						done
 						if [ ${found} -eq 1 ]; then
-							[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${HOST_WATTS}`'watts"
+							[ "${PS1}" != "0.0" ] && PS1=`echo "scale=1; ${PS1}/10" | bc` && (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}"
+							[ "${PS2}" != "0.0" ] && PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}"
+							HOST_AMPS=`echo "scale=1; ${PS1}+${PS2}" | bc`
+							[[ "${HOST_WATTS}" = *"Timeout"* ]] && HOST_WATTS_disp="${idsCL[LightRed]}Host Offline" || HOST_WATTS_disp="${idsCL[Green]}${HOST_AMPS}'amps - `IDS_NUMBER_FORMAT ${HOST_WATTS}`'watts"
 						else
 							HOST_WATTS_disp="${idsCL[LightRed]}Could not pull data"
 						fi
@@ -774,8 +777,6 @@ CHECKPOWER(){
 						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
-						[ "${PS1}" != "0.0" ] && PS1=`echo "scale=1; ${PS1}/10" | bc` && (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}"
-						[ "${PS2}" != "0.0" ] && PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}"
 						echo -en "${idsCL[LightCyan]}	[PS1=${PS1}'A, PS2=${PS2}'A]"
 					fi		
 					echo -e "${idsCL[Default]}"