diff --git a/custom_components/philips_airpurifier_coap/const.py b/custom_components/philips_airpurifier_coap/const.py
index 63aa6e7..4df26e3 100644
--- a/custom_components/philips_airpurifier_coap/const.py
+++ b/custom_components/philips_airpurifier_coap/const.py
@@ -72,6 +72,7 @@ class ICON:
 MODEL_AC2939 = "AC2939"
 MODEL_AC2958 = "AC2958"
 MODEL_AC3033 = "AC3033"
+MODEL_AC3036 = "AC3036"
 MODEL_AC3039 = "AC3039"
 MODEL_AC3059 = "AC3059"
 MODEL_AC3829 = "AC3829"
diff --git a/custom_components/philips_airpurifier_coap/philips.py b/custom_components/philips_airpurifier_coap/philips.py
index 8fd337c..b333f55 100644
--- a/custom_components/philips_airpurifier_coap/philips.py
+++ b/custom_components/philips_airpurifier_coap/philips.py
@@ -444,7 +444,7 @@ class PhilipsAC2958(PhilipsGenericCoAPFan):
     }
 
 
-class PhilipsAC3033(PhilipsGenericCoAPFan):
+class PhilipsAC30xx(PhilipsGenericCoAPFan):
     AVAILABLE_PRESET_MODES = {
         PRESET_MODE_AUTO: {PHILIPS_POWER: "1", PHILIPS_MODE: "AG"},
         PRESET_MODE_SLEEP: {PHILIPS_POWER: "1", PHILIPS_MODE: "S", PHILIPS_SPEED: "s"},
@@ -456,28 +456,17 @@ class PhilipsAC3033(PhilipsGenericCoAPFan):
     }
 
 
-class PhilipsAC3039(PhilipsGenericCoAPFan):
-    AVAILABLE_PRESET_MODES = {
-        PRESET_MODE_AUTO: {PHILIPS_POWER: "1", PHILIPS_MODE: "AG"},
-        PRESET_MODE_SLEEP: {PHILIPS_POWER: "1", PHILIPS_MODE: "S", PHILIPS_SPEED: "s"},
-    }
-    AVAILABLE_SPEEDS = {
-        SPEED_1: {PHILIPS_POWER: "1", PHILIPS_MODE: "M", PHILIPS_SPEED: "1"},
-        SPEED_2: {PHILIPS_POWER: "1", PHILIPS_MODE: "M", PHILIPS_SPEED: "2"},
-        PRESET_MODE_TURBO: {PHILIPS_POWER: "1", PHILIPS_MODE: "T", PHILIPS_SPEED: "t"},
-    }
+class PhilipsAC3033(PhilipsAC30xx):
+    pass
 
+class PhilipsAC3036(PhilipsAC30xx):
+    pass
 
-class PhilipsAC3059(PhilipsGenericCoAPFan):
-    AVAILABLE_PRESET_MODES = {
-        PRESET_MODE_AUTO: {PHILIPS_POWER: "1", PHILIPS_MODE: "AG"},
-        PRESET_MODE_SLEEP: {PHILIPS_POWER: "1", PHILIPS_MODE: "S", PHILIPS_SPEED: "s"},
-    }
-    AVAILABLE_SPEEDS = {
-        SPEED_1: {PHILIPS_POWER: "1", PHILIPS_MODE: "M", PHILIPS_SPEED: "1"},
-        SPEED_2: {PHILIPS_POWER: "1", PHILIPS_MODE: "M", PHILIPS_SPEED: "2"},
-        PRESET_MODE_TURBO: {PHILIPS_POWER: "1", PHILIPS_MODE: "T", PHILIPS_SPEED: "t"},
-    }
+class PhilipsAC3039(PhilipsAC30xx):
+    pass
+
+class PhilipsAC3059(PhilipsAC30xx):
+    pass
 
 
 class PhilipsAC3829(PhilipsHumidifierMixin, PhilipsGenericCoAPFan):
@@ -541,6 +530,7 @@ class PhilipsAC5659(PhilipsGenericCoAPFan):
     MODEL_AC2939: PhilipsAC2939,
     MODEL_AC2958: PhilipsAC2958,
     MODEL_AC3033: PhilipsAC3033,
+    MODEL_AC3036: PhilipsAC3036,
     MODEL_AC3039: PhilipsAC3039,
     MODEL_AC3059: PhilipsAC3059,
     MODEL_AC3829: PhilipsAC3829,