diff --git a/configuration.yaml b/configuration.yaml
index 10ddb2c..5f62db1 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -237,6 +237,56 @@ sensor:
     method: left
     round: 2
 
+# 3D Printer Statistics (OctoPrint via MQTT discovery)
+history_stats:
+  - name: "Printer Print Time Today"
+    unique_id: printer_print_time_today
+    entity_id: binary_sensor.octoprint_printing
+    state: "on"
+    type: time
+    start: "{{ today_at() }}"
+    end: "{{ now() }}"
+
+  - name: "Printer Print Time This Week"
+    unique_id: printer_print_time_this_week
+    entity_id: binary_sensor.octoprint_printing
+    state: "on"
+    type: time
+    start: "{{ now().replace(hour=0, minute=0, second=0, microsecond=0) - timedelta(days=now().weekday()) }}"
+    end: "{{ now() }}"
+
+  - name: "Printer Print Time Last 7 Days"
+    unique_id: printer_print_time_last_7_days
+    entity_id: binary_sensor.octoprint_printing
+    state: "on"
+    type: time
+    start: "{{ now() - timedelta(days=7) }}"
+    end: "{{ now() }}"
+
+  - name: "Printer Prints Today"
+    unique_id: printer_prints_today
+    entity_id: binary_sensor.octoprint_printing
+    state: "on"
+    type: count
+    start: "{{ today_at() }}"
+    end: "{{ now() }}"
+
+  - name: "Printer Prints This Week"
+    unique_id: printer_prints_this_week
+    entity_id: binary_sensor.octoprint_printing
+    state: "on"
+    type: count
+    start: "{{ now().replace(hour=0, minute=0, second=0, microsecond=0) - timedelta(days=now().weekday()) }}"
+    end: "{{ now() }}"
+
+  - name: "Printer Prints Last 7 Days"
+    unique_id: printer_prints_last_7_days
+    entity_id: binary_sensor.octoprint_printing
+    state: "on"
+    type: count
+    start: "{{ now() - timedelta(days=7) }}"
+    end: "{{ now() }}"
+
 emulated_hue:
   host_ip: 192.168.1.140
   advertise_ip: 192.168.1.140
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index bf7d0d2..6fab823 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -22,12 +22,12 @@
     },
     "0xffffb40e0607af27": {
         "state": "ON",
-        "voltage": 119.9,
+        "voltage": 120.7,
         "ac_frequency": 60,
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2,
+        "power": 2.5,
         "current": 0.11,
         "energy": 26.76,
         "power_factor": 0.15,
@@ -77,8 +77,8 @@
         "voltage": 119.7,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 101.78,
-        "power": 112.2,
+        "energy": 101.79,
+        "power": 110.5,
         "current": 1.05,
         "power_factor": 0.95,
         "update": {
@@ -98,7 +98,7 @@
         "voltage": 120.5,
         "energy": 43.38,
         "state": "ON",
-        "power": 23.8,
+        "power": 22.9,
         "current": 0.32,
         "ac_frequency": 60,
         "power_factor": 0.63,
@@ -143,7 +143,7 @@
         "current": 0.02,
         "ac_frequency": 60,
         "power": 0.3,
-        "power_factor": 0.2,
+        "power_factor": 0.14,
         "update": {
             "state": "idle",
             "installed_version": 268513381,
@@ -172,13 +172,13 @@
     "0xffffb40e060893d8": {
         "state": "ON",
         "led_brightness": 100,
-        "voltage": 121.5,
+        "voltage": 122,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
         "energy": 3.03,
         "power_on_behavior": "on",
         "linkquality": 87,
-        "current": 0.03,
+        "current": 0.02,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -187,8 +187,8 @@
             "latest_source": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/ThirdReality/SmartPlug_Zigbee_PROD_OTA_V101_1.01.01.ota",
             "latest_release_notes": null
         },
-        "power_factor": 0.06,
-        "power": 1.4
+        "power_factor": 0.07,
+        "power": 0.1
     },
     "0xa4c1380d0679ffff": {
         "battery": 100,
@@ -245,7 +245,7 @@
     },
     "0xb40e060fffe717c5": {
         "battery": 100,
-        "occupancy": false,
+        "occupancy": true,
         "tamper": false,
         "battery_low": false,
         "linkquality": 72,