diff --git a/hilo_eventhistory_state.yaml b/hilo_eventhistory_state.yaml
index deeb6bfb..51b79941 100644
--- a/hilo_eventhistory_state.yaml
+++ b/hilo_eventhistory_state.yaml
@@ -91,28 +91,6 @@
     total_devices: 2
     used_kWh: 20.82
     used_percentage: 82.72
-  - allowed_kWh: 38.83
-    configurable: false
-    event_id: 369
-    last_update: 2026-06-09 00:37:32.901247-04:00
-    mode: moderate
-    opt_out_devices: 0
-    participating: false
-    period: pm
-    phases:
-      preheat_end: 2026-01-26 16:00:00-05:00
-      preheat_start: 2026-01-26 14:00:00-05:00
-      recovery_end: 2026-01-26 21:00:00-05:00
-      recovery_start: 2026-01-26 20:00:00-05:00
-      reduction_end: 2026-01-26 20:00:00-05:00
-      reduction_start: 2026-01-26 16:00:00-05:00
-      settingsDeadlineUTC: 2026-01-26 00:00:00-05:00
-    pre_heat_devices: 1
-    reward: 12.75
-    state: 'off'
-    total_devices: 2
-    used_kWh: 16.36
-    used_percentage: 42.13
   - allowed_kWh: 34.28
     configurable: false
     event_id: 368
@@ -135,28 +113,28 @@
     total_devices: 2
     used_kWh: 34.28
     used_percentage: 100.0
-  - allowed_kWh: 34.98
+  - allowed_kWh: 38.83
     configurable: false
-    event_id: 365
-    last_update: 2026-06-09 00:37:33.013096-04:00
+    event_id: 369
+    last_update: 2026-06-09 00:37:32.901247-04:00
     mode: moderate
     opt_out_devices: 0
     participating: false
     period: pm
     phases:
-      preheat_end: 2026-01-25 16:00:00-05:00
-      preheat_start: 2026-01-25 14:00:00-05:00
-      recovery_end: 2026-01-25 21:00:00-05:00
-      recovery_start: 2026-01-25 20:00:00-05:00
-      reduction_end: 2026-01-25 20:00:00-05:00
-      reduction_start: 2026-01-25 16:00:00-05:00
-      settingsDeadlineUTC: 2026-01-25 00:00:00-05:00
+      preheat_end: 2026-01-26 16:00:00-05:00
+      preheat_start: 2026-01-26 14:00:00-05:00
+      recovery_end: 2026-01-26 21:00:00-05:00
+      recovery_start: 2026-01-26 20:00:00-05:00
+      reduction_end: 2026-01-26 20:00:00-05:00
+      reduction_start: 2026-01-26 16:00:00-05:00
+      settingsDeadlineUTC: 2026-01-26 00:00:00-05:00
     pre_heat_devices: 1
-    reward: 0.0
+    reward: 12.75
     state: 'off'
     total_devices: 2
-    used_kWh: 34.98
-    used_percentage: 100.0
+    used_kWh: 16.36
+    used_percentage: 42.13
   - allowed_kWh: 39.04
     configurable: false
     event_id: 364
@@ -179,6 +157,28 @@
     total_devices: 2
     used_kWh: 28.92
     used_percentage: 74.08
+  - allowed_kWh: 34.98
+    configurable: false
+    event_id: 365
+    last_update: 2026-06-09 00:37:33.013096-04:00
+    mode: moderate
+    opt_out_devices: 0
+    participating: false
+    period: pm
+    phases:
+      preheat_end: 2026-01-25 16:00:00-05:00
+      preheat_start: 2026-01-25 14:00:00-05:00
+      recovery_end: 2026-01-25 21:00:00-05:00
+      recovery_start: 2026-01-25 20:00:00-05:00
+      reduction_end: 2026-01-25 20:00:00-05:00
+      reduction_start: 2026-01-25 16:00:00-05:00
+      settingsDeadlineUTC: 2026-01-25 00:00:00-05:00
+    pre_heat_devices: 1
+    reward: 0.0
+    state: 'off'
+    total_devices: 2
+    used_kWh: 34.98
+    used_percentage: 100.0
   - allowed_kWh: 29.42
     configurable: false
     event_id: 362
@@ -223,28 +223,6 @@
     total_devices: 2
     used_kWh: 16.31
     used_percentage: 75.06
-  - allowed_kWh: 22.46
-    configurable: false
-    event_id: 357
-    last_update: 2026-06-09 00:37:33.031031-04:00
-    mode: moderate
-    opt_out_devices: 0
-    participating: false
-    period: pm
-    phases:
-      preheat_end: 2026-01-05 16:00:00-05:00
-      preheat_start: 2026-01-05 14:00:00-05:00
-      recovery_end: 2026-01-05 21:00:00-05:00
-      recovery_start: 2026-01-05 20:00:00-05:00
-      reduction_end: 2026-01-05 20:00:00-05:00
-      reduction_start: 2026-01-05 16:00:00-05:00
-      settingsDeadlineUTC: 2026-01-05 00:00:00-05:00
-    pre_heat_devices: 1
-    reward: 1.4
-    state: 'off'
-    total_devices: 2
-    used_kWh: 19.98
-    used_percentage: 88.96
   - allowed_kWh: 27.66
     configurable: false
     event_id: 356
@@ -267,6 +245,28 @@
     total_devices: 2
     used_kWh: 27.66
     used_percentage: 100.0
+  - allowed_kWh: 22.46
+    configurable: false
+    event_id: 357
+    last_update: 2026-06-09 00:37:33.031031-04:00
+    mode: moderate
+    opt_out_devices: 0
+    participating: false
+    period: pm
+    phases:
+      preheat_end: 2026-01-05 16:00:00-05:00
+      preheat_start: 2026-01-05 14:00:00-05:00
+      recovery_end: 2026-01-05 21:00:00-05:00
+      recovery_start: 2026-01-05 20:00:00-05:00
+      reduction_end: 2026-01-05 20:00:00-05:00
+      reduction_start: 2026-01-05 16:00:00-05:00
+      settingsDeadlineUTC: 2026-01-05 00:00:00-05:00
+    pre_heat_devices: 1
+    reward: 1.4
+    state: 'off'
+    total_devices: 2
+    used_kWh: 19.98
+    used_percentage: 88.96
   - allowed_kWh: 23.58
     configurable: false
     event_id: 354
@@ -289,28 +289,6 @@
     total_devices: 2
     used_kWh: 23.58
     used_percentage: 100.0
-  - allowed_kWh: 19.37
-    configurable: false
-    event_id: 348
-    last_update: 2026-06-09 00:37:33.055551-04:00
-    mode: moderate
-    opt_out_devices: 0
-    participating: false
-    period: pm
-    phases:
-      preheat_end: 2025-12-14 16:00:00-05:00
-      preheat_start: 2025-12-14 14:00:00-05:00
-      recovery_end: 2025-12-14 21:00:00-05:00
-      recovery_start: 2025-12-14 20:00:00-05:00
-      reduction_end: 2025-12-14 20:00:00-05:00
-      reduction_start: 2025-12-14 16:00:00-05:00
-      settingsDeadlineUTC: 2025-12-14 00:00:00-05:00
-    pre_heat_devices: 1
-    reward: 0.0
-    state: 'off'
-    total_devices: 2
-    used_kWh: 19.37
-    used_percentage: 100.0
   - allowed_kWh: 20.72
     configurable: false
     event_id: 346
@@ -333,6 +311,28 @@
     total_devices: 2
     used_kWh: 20.72
     used_percentage: 100.0
+  - allowed_kWh: 19.37
+    configurable: false
+    event_id: 348
+    last_update: 2026-06-09 00:37:33.055551-04:00
+    mode: moderate
+    opt_out_devices: 0
+    participating: false
+    period: pm
+    phases:
+      preheat_end: 2025-12-14 16:00:00-05:00
+      preheat_start: 2025-12-14 14:00:00-05:00
+      recovery_end: 2025-12-14 21:00:00-05:00
+      recovery_start: 2025-12-14 20:00:00-05:00
+      reduction_end: 2025-12-14 20:00:00-05:00
+      reduction_start: 2025-12-14 16:00:00-05:00
+      settingsDeadlineUTC: 2025-12-14 00:00:00-05:00
+    pre_heat_devices: 1
+    reward: 0.0
+    state: 'off'
+    total_devices: 2
+    used_kWh: 19.37
+    used_percentage: 100.0
   - allowed_kWh: 35.01
     configurable: false
     event_id: 344
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 15e5530e..5befa7a6 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -4,7 +4,7 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120.3,
+        "voltage": 120.2,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
         "power_factor": 0.14,
@@ -27,10 +27,10 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 235.1,
-        "current": 2.01,
-        "energy": 29.47,
-        "power_factor": 0.98,
+        "power": 2.2,
+        "current": 0.12,
+        "energy": 29.57,
+        "power_factor": 0.2,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -45,9 +45,9 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.8,
+        "voltage": 120,
         "countdown_to_turn_on": 0,
-        "energy": 58.56,
+        "energy": 58.58,
         "power_factor": 0.88,
         "ac_frequency": 60,
         "update": {
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 134,
-        "power": 84.1,
-        "current": 0.79,
+        "power": 83,
+        "current": 0.78,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -74,13 +74,13 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 118.8,
+        "voltage": 119.3,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 120.63,
-        "power": 100.3,
-        "current": 0.91,
-        "power_factor": 0.94,
+        "energy": 120.68,
+        "power": 0.8,
+        "current": 0.05,
+        "power_factor": 0.34,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -95,11 +95,11 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "voltage": 119.1,
-        "energy": 55.11,
+        "voltage": 120.1,
+        "energy": 55.13,
         "state": "ON",
-        "power": 16.8,
-        "current": 0.3,
+        "power": 17.3,
+        "current": 0.31,
         "ac_frequency": 60,
         "power_factor": 0.53,
         "update": {
@@ -114,12 +114,12 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 120,
+        "voltage": 120.3,
         "ac_frequency": 60,
-        "energy": 8.18,
+        "energy": 8.2,
         "current": 0.02,
-        "power": 0,
-        "power_factor": 0.13,
+        "power": 0.1,
+        "power_factor": 0.22,
         "linkquality": 123,
         "update": {
             "state": "idle",
@@ -136,14 +136,14 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120.5,
+        "voltage": 120.7,
         "energy": 17.66,
         "countdown_to_turn_on": 0,
         "state": "ON",
         "current": 0.02,
         "ac_frequency": 60,
         "power": 0.4,
-        "power_factor": 0.15,
+        "power_factor": 0.2,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -188,7 +188,7 @@
             "latest_release_notes": null
         },
         "power_factor": 0.06,
-        "power": 0.1
+        "power": 0.4
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,