diff --git a/automations.yaml b/automations.yaml
index 862b770b..112cd050 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -3562,6 +3562,16 @@
     entity_id: sensor.sparkx_i7_print_status
     state: printing
   actions:
+  - variables:
+      milestone: '{% set source = trigger.get(''entity_id'', '''') %} {% set tstate
+        = trigger.get(''to_state'') %} {% set value = tstate.state | float(0) if tstate
+        else 0 %} {% if source == ''sensor.sparkx_i7_position_z'' %} First layers
+        (Z {{ value }} mm) {% elif source == ''sensor.sparkx_i7_print_progress'' %}
+        {% if value >= 75 %} 75% complete {% elif value >= 50 %} 50% complete {% else
+        %} 25% complete {% endif %} {% else %} Manual test {% endif %}'
+      tag: '{% set source = trigger.get(''entity_id'', '''') %} {% if source == ''sensor.sparkx_i7_position_z''
+        %} z1 {% elif source == ''sensor.sparkx_i7_print_progress'' %} p{{ trigger.get(''above'',
+        0) | int }} {% else %} test {% endif %}'
   - variables:
       bedroom_needs_light: '{{ not is_state(''light.bedroom_lamp_2'', ''on'') }}'
       message: '{% set file = state_attr(''sensor.sparkx_i7_print_status'', ''file'')
@@ -3570,15 +3580,7 @@
         | int(0) %} {% set left = states(''sensor.sparkx_i7_print_time_left'') | int(0)
         %} 3D print · {{ milestone }} · {{ name }} at {{ pct }}%{% if left > 0 %}
         · {{ (left // 3600) }}h {{ ((left % 3600) // 60) }}m left{% endif %}'
-      milestone: '{% set source = trigger.entity_id | default('''') %} {% set value
-        = trigger.to_state.state | default(0) | float(0) %} {% if source == ''sensor.sparkx_i7_position_z''
-        %} First layers (Z {{ value }} mm) {% elif source == ''sensor.sparkx_i7_print_progress''
-        %} {% if value >= 75 %} 75% complete {% elif value >= 50 %} 50% complete {%
-        else %} 25% complete {% endif %} {% else %} Manual test {% endif %}'
       sparkx_needs_light: '{{ not is_state(''light.sparkx_i7_light'', ''on'') }}'
-      tag: '{% set source = trigger.entity_id | default('''') %} {% if source == ''sensor.sparkx_i7_position_z''
-        %} z1 {% elif source == ''sensor.sparkx_i7_print_progress'' %} p{{ trigger.above
-        | default(0) | int }} {% else %} test {% endif %}'
   - if:
     - condition: template
       value_template: '{{ sparkx_needs_light }}'
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index d2a8b24e..d52cbcf8 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": 119.8,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
         "power_factor": 0.14,
@@ -27,7 +27,7 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 1.9,
+        "power": 2,
         "current": 0.09,
         "energy": 50.9,
         "power_factor": 0.17,
@@ -47,8 +47,8 @@
         "countdown_to_turn_off": 0,
         "voltage": 119.3,
         "countdown_to_turn_on": 0,
-        "energy": 96.42,
-        "power_factor": 0.88,
+        "energy": 96.43,
+        "power_factor": 0.2,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 145,
-        "power": 85.2,
-        "current": 0.85,
+        "power": 0.2,
+        "current": 0.01,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -77,10 +77,10 @@
         "voltage": 118.8,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 198.9,
+        "energy": 198.91,
         "power": 0.8,
         "current": 0.05,
-        "power_factor": 0.39,
+        "power_factor": 0.34,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -98,8 +98,8 @@
         "voltage": 119.6,
         "energy": 96.08,
         "state": "ON",
-        "power": 16.5,
-        "current": 0.26,
+        "power": 17.2,
+        "current": 0.25,
         "ac_frequency": 60,
         "power_factor": 0.58,
         "update": {
@@ -143,7 +143,7 @@
         "current": 0.02,
         "ac_frequency": 60,
         "power": 0.3,
-        "power_factor": 0.14,
+        "power_factor": 0.2,
         "update": {
             "state": "idle",
             "installed_version": 268513381,