diff --git a/device-comet.mk b/device-comet.mk
index 867d7cb..394cbd9 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -65,7 +65,6 @@ endif
 
 include device/google/comet/audio/comet/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/predump_gti_dual.mk
 include device/google/gs-common/display/dump_second_display.mk
@@ -402,8 +401,8 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# Media Performance Class 14
-PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
+# Media Performance Class 15
+PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=35
 
 # OIS with system imu
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 20dcbd4..2695060 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -333,7 +333,6 @@
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
       "Values": [
         "765",
-        "600",
         "1"
       ],
       "ResetOnInit": true
@@ -347,11 +346,21 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "TAUclampMinOnNiceHighValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value",
+      "Values": [
+        "765",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "TAUclampMinOnNiceMidValue",
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
       "Values": [
         "600",
+        "590",
         "0"
       ],
       "ResetOnInit": true
@@ -360,6 +369,7 @@
       "Name": "TAUclampMinOnNiceHighPrio",
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
       "Values": [
+        "110",
         "119",
         "120"
       ],
@@ -370,6 +380,7 @@
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
       "Values": [
         "128",
+        "139",
         "130"
       ],
       "ResetOnInit": true
@@ -484,6 +495,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "TAAutoPreferFit",
+      "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "TAPreferredIdleMaskHigh",
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
@@ -1044,12 +1064,6 @@
       "Duration": 5000,
       "Value": "512"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "TAUClampBoost",
-      "Duration": 5000,
-      "Value": "765"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGUClampBoost",
@@ -1233,6 +1247,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAAutoPreferFit",
+      "Duration": 5000,
+      "Value": "1"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAPreferredIdleMaskHigh",
@@ -1241,9 +1261,33 @@
     },
     {
       "PowerHint": "LAUNCH",
-      "Node": "TAPreferredIdleMaskMid",
+      "Node": "TAUclampMinOnNiceEnable",
       "Duration": 5000,
-      "Value": "0xff"
+      "Value": "1"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceHighValue",
+       "Duration": 5000,
+       "Value": "765"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 5000,
+      "Value": "110"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceMidValue",
+       "Duration": 5000,
+       "Value": "590"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 5000,
+      "Value": "139"
     },
     {
       "PowerHint": "LAUNCH",