diff --git a/powerwall.sh b/powerwall.sh
index 1f4dbefc..3ddab740 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -556,6 +556,7 @@ CHECKPOWER(){
 			[[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.1f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 			BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
+			[ ${BATTA} -le 0 ] && BATTA_disp="${idsCL[Green]}${BATTA}'A - Charging" || BATTA_disp="${idsCL[LightRed]}${BATTA}'A - Discharging"
 		fi
 		
 		echo -e "${idsCL[LightCyan]}Inverter Input Volts     ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}'V"
@@ -566,7 +567,7 @@ CHECKPOWER(){
 		echo -e "${idsCL[LightCyan]}Inverter Output Watts    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTW}'W"
 		echo
 		echo -e "${idsCL[LightCyan]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'V${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}Battery Amps Draw/Charge ${idsCL[Default]}: ${idsCL[Green]}${BATTA}'A${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}Battery Amps Chg/DChg    ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
 		echo
 		
 		if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then