diff --git a/config/packages/sungrow.yaml b/config/packages/sungrow.yaml
index 499a70b..6540752 100644
--- a/config/packages/sungrow.yaml
+++ b/config/packages/sungrow.yaml
@@ -230,15 +230,17 @@ automation:
       should_slow_battery: >
         {{ states('sensor.inverter_pv_power')     | float > 5100 and
            states('sensor.inverter_active_power') | float < 4200 }}
+      enough_in_day: >
+        {{2*kwh_until_full < states('sensor.solcast_forecast_remaining_today') | float}}
     condition: []
     action:
       - choose:
           - conditions:
-              - "{{ should_slow_battery and not sunsetting and 2*kwh_until_full < states('sensor.solcast_forecast_remaining_today') | float }}"
+              - "{{ should_slow_battery and not sunsetting and enough_in_day }}"
             sequence:
-              - service: script.inverter_force_battery_charge
+              - service: script.inverter_force_battery_charge # with low charge rate -- which i have to manually set for now
           - conditions:
-              - "{{ states('sensor.inverter_pv_power') | float < 4900 }}"
+              - "{{ states('sensor.inverter_pv_power') | float < 4900 or not enough_in_day or sunsetting }}"
             sequence:
               - service: script.inverter_self_consumption
         default: []
diff --git a/config/zigbee2mqtt/state.json b/config/zigbee2mqtt/state.json
index bcd4c53..1e33278 100644
--- a/config/zigbee2mqtt/state.json
+++ b/config/zigbee2mqtt/state.json
@@ -9,8 +9,8 @@
     },
     "0x00158d0008091c32": {
         "contact": false,
-        "voltage": 2995,
-        "battery": 41,
+        "voltage": 3005,
+        "battery": 44,
         "temperature": 19,
         "linkquality": 255,
         "device_temperature": 21,
@@ -22,16 +22,16 @@
         "battery": 44,
         "temperature": 17,
         "linkquality": 255,
-        "device_temperature": 16,
+        "device_temperature": 17,
         "power_outage_count": 7
     },
     "0x00158d0007e7725b": {
-        "contact": true,
+        "contact": false,
         "voltage": 2975,
         "battery": 36,
         "temperature": 18,
         "linkquality": 255,
-        "device_temperature": 16,
+        "device_temperature": 22,
         "power_outage_count": 8
     },
     "0x00158d0008091b58": {
@@ -53,7 +53,7 @@
         "power_outage_count": 41
     },
     "0x5c0272fffee93bae": {
-        "occupancy": true,
+        "occupancy": false,
         "tamper": false,
         "battery_low": false,
         "linkquality": 255
@@ -67,11 +67,11 @@
         "linkquality": 191
     },
     "0xa4c138fda4db2c5e": {
-        "occupancy": true,
+        "occupancy": false,
         "battery": 50,
         "sensitivity": "high",
         "keep_time": "120",
-        "illuminance": 826,
+        "illuminance": 850,
         "linkquality": 127
     },
     "0x84b4dbfffe850fda": {
diff --git a/lovelace/lovelace.lovelace_solar.yaml b/lovelace/lovelace.lovelace_solar.yaml
index 1efbc03..551a28a 100644
--- a/lovelace/lovelace.lovelace_solar.yaml
+++ b/lovelace/lovelace.lovelace_solar.yaml
@@ -493,7 +493,8 @@ config:
         hours_to_show: 1
         type: logbook
       filter:
-        exclude: []
+        exclude:
+        - entity_id: /maximise_output/
         include:
         - domain: automation
           name: /[Ii]nverter/