diff --git a/bluetooth/bluetooth_power_limits_comet_JP.csv b/bluetooth/bluetooth_power_limits_comet_JP.csv
new file mode 100644
index 0000000..8131391
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_comet_JP.csv
@@ -0,0 +1,71 @@
+Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
+off,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+on,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
diff --git a/device-comet.mk b/device-comet.mk
index affed1c..b404f30 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -140,6 +140,7 @@ PRODUCT_COPY_FILES += \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_backup_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_backup.json \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
+	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \
 
 PRODUCT_PACKAGES += \
 	init_thermal_config
@@ -159,6 +160,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
+    $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CE.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CE.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
@@ -182,7 +184,7 @@ PRODUCT_PACKAGES_DEBUG += \
 
 # Bluetotoh Auto On feature
 PRODUCT_PRODUCT_PROPERTIES +=\
-    bluetooth.server.automatic_turn_on=false
+    bluetooth.server.automatic_turn_on=true
 
 # Bluetooth AAC VBR
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 3a6e767..c8d1d4d 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -221,7 +221,6 @@
         "0x0",
         "0x80"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -600,19 +599,11 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "PMU_LIT_LCPI_THRESHOLD",
-      "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold",
-      "Values": [
-        "2",
-        "0"
-      ],
-      "DefaultIndex": 0
-    },
     {
       "Name": "PMU_LIT_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
+        "76",
         "70",
         "55",
         "42",
@@ -633,18 +624,11 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
-    {
-      "Name": "PMU_MID_LCPI_THRESHOLD",
-      "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold",
-      "Values": [
-        "3"
-      ],
-      "DefaultIndex": 0
-    },
     {
       "Name": "PMU_MID_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
+        "59",
         "50",
         "32",
         "30",
@@ -663,18 +647,11 @@
       ],
       "DefaultIndex": 0
     },
-    {
-      "Name": "PMU_BIG_LCPI_THRESHOLD",
-      "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/lcpi_threshold",
-      "Values": [
-        "3"
-      ],
-      "DefaultIndex": 0
-    },
     {
       "Name": "PMU_BIG_SPC_THRESHOLD",
       "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold",
       "Values": [
+        "62",
         "50",
         "22",
         "20"
@@ -866,6 +843,12 @@
       "Duration": 1000,
       "Value": "0-3"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "CPUSkipMask",
+      "Duration": 5000,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "ReducePreferIdle",
@@ -1126,6 +1109,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUSkipMask",
+      "Duration": 2000,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -1287,6 +1276,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CPUSkipMask",
+      "Duration": 1000,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPU_BIG_TSKIN_BYPASS",
@@ -1749,12 +1744,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -1767,12 +1756,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -1785,12 +1768,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_BIG_SPC_THRESHOLD",
@@ -1881,6 +1858,12 @@
       "Duration": 0,
       "Value": "camera"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1899,12 +1882,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -1917,12 +1894,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -1935,12 +1906,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_BIG_SPC_THRESHOLD",
@@ -2073,12 +2038,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -2091,12 +2050,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -2109,12 +2062,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_SPC_THRESHOLD",
@@ -2301,6 +2248,12 @@
       "Duration": 0,
       "Value": "4-7"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PowerHALCameraRunning",
@@ -2433,18 +2386,18 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "2"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
       "Value": "30"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x0"
+    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -3040,12 +2993,6 @@
       "Duration": 0,
       "Value": "1098000"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "PMU_LIT_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
@@ -3058,12 +3005,6 @@
       "Duration": 0,
       "Value": "1328000"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "PMU_MID_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
@@ -3076,12 +3017,6 @@
       "Duration": 0,
       "Value": "1298000"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "PMU_BIG_LCPI_THRESHOLD",
-      "Duration": 0,
-      "Value": "3"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_SPC_THRESHOLD",
@@ -3197,7 +3132,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3230,7 +3165,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
@@ -3263,7 +3198,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JankCheckTimeFactor": 1.43,
+      "JankCheckTimeFactor": 1.2,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300
     },
diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json
index e8b7e55..8ab9979 100644
--- a/thermal/thermal_info_config_charge_comet.json
+++ b/thermal/thermal_info_config_charge_comet.json
@@ -4,7 +4,6 @@
       "Name": "soc_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -13,7 +12,6 @@
       "Name": "rffe_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -22,7 +20,6 @@
       "Name": "modem_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -31,7 +28,6 @@
       "Name": "gnss_tcxo_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -40,7 +36,6 @@
       "Name": "usb_conn_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 46.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
@@ -49,7 +44,6 @@
       "Name": "charger_therm",
       "Type": "UNKNOWN",
       "HotThreshold": ["NaN", 34.89, "NaN", "NaN", "NaN", "NaN", "NaN"],
-      "TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
       "Multiplier": 0.001,
       "PollingDelay": 300000,
       "PassiveDelay": 7000
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index bb699f5..22463a5 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -44,7 +44,6 @@
             "Name": "soc_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -53,7 +52,6 @@
             "Name": "rffe_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -62,7 +60,6 @@
             "Name": "modem_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -71,7 +68,6 @@
             "Name": "gnss_tcxo_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -80,7 +76,6 @@
             "Name": "usb_conn_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NAN", 30.79, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath": "/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -89,7 +84,6 @@
             "Name": "charger_therm",
             "Type": "UNKNOWN",
             "HotThreshold": ["NAN", 34.89, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
@@ -97,13 +91,11 @@
         {
             "Name": "inner_display_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/inner_display_therm/tz_temp",
             "Multiplier": 0.001
         },
         {
             "Name": "display_therm",
             "Type": "UNKNOWN",
-            "TempPath": "/dev/thermal/tz-by-name/display_therm/tz_temp",
             "Multiplier": 0.001
         },
         {
@@ -237,14 +229,11 @@
             "Type":"UNKNOWN",
             "Version": "1.0",
             "VirtualSensor":true,
-            "Hidden": true,
             "ModelPath":"vt_estimation_model.tflite",
             "Formula": "USE_ML_MODEL",
             "Combination":["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm",  "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"],
             "Multiplier":0.001,
-            "PreviousSampleCount": 3,
-            "BackupSensor": "VIRTUAL-SKIN-LEGACY",
-            "ValidateInput": true
+            "PreviousSampleCount": 3
         },
         {
             "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@@ -256,20 +245,6 @@
             "Coefficient": [1.0, -1.0],
             "Multiplier": 1
         },
-        {
-            "Name": "STATS-UPDATOR",
-            "Type": "UNKNOWN",
-            "VirtualSensor": true,
-            "Hidden": true,
-            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
-            "Coefficient": [0.0, 0.0, 0.0],
-            "Multiplier": 1,
-            "SendPowerHint": true,
-            "PollingDelay": 300000,
-            "PassiveDelay": 7000
-        },
         {
             "Name": "VIRTUAL-SKIN",
             "Type": "SKIN",
@@ -344,7 +319,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S4M_VDD_CPUCL0",
-                    "CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
+                    "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
@@ -352,7 +327,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S2M_VDD_CPUCL1",
-                    "CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
+                    "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -360,7 +335,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
-                    "CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
+                    "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
                 }
             ],
             "Profile": [
@@ -420,21 +395,22 @@
                     "CdevWeightForPID": [0.292, 0.292, 0.292, 0.292, 0.292, 0.292, 0.292],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
-                    "CdevCeiling": [0, 7, 7, 7, 7, 7, 7]
+                    "CdevCeilingFrequency": [1950000, 1098000, 1098000, 1098000, 1098000, 1098000, 1098000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
                     "CdevWeightForPID": [0.804, 0.804, 0.804, 0.804, 0.804, 0.804, 0.804],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
+                    "CdevCeilingFrequency": [2600000, 1221000, 1221000, 1221000, 1221000, 1221000, 1221000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
                     "CdevWeightForPID": [0.342, 0.342, 0.342, 0.342, 0.342, 0.342, 0.342],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
+                    "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
+     
                 }
             ],
             "Profile": [
@@ -511,21 +487,21 @@
                     "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
-                    "CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
+                    "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
                     "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 13, 13, 13, 13, 13, 13]
+                    "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 787000, 787000, 787000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
                     "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
-                    "CdevCeiling": [0, 17, 17, 17, 17, 17, 17]
+                    "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000]
                 }
             ],
             "Profile": [
@@ -559,25 +535,21 @@
                             ],
                             "MaxReleaseStep": 1,
                             "MaxThrottleStep": 1,
-                            "CdevCeiling": [0, 2, 2, 2, 2, 2, 2]
-                        },
-                        {
+                            "CdevCeilingFrequency": [1950000, 1696000, 1696000, 1696000, 1696000, 1696000, 1696000]
+                         },
+                         {
                             "CdevRequest": "thermal-cpufreq-1",
-                            "CdevWeightForPID": [
-                                0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428
-                            ],
+                            "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
                             "MaxReleaseStep": 1,
                             "MaxThrottleStep": 2,
-                            "CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
-                        },
-                        {
+                            "CdevCeilingFrequency": [2600000, 1795000, 1795000, 1795000, 1795000, 1795000, 1795000]
+                         },
+                         {
                             "CdevRequest": "thermal-cpufreq-2",
-                            "CdevWeightForPID": [
-                                0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225
-                            ],
+                            "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
                             "MaxReleaseStep": 1,
                             "MaxThrottleStep": 2,
-                            "CdevCeiling": [0, 15, 15, 15, 15, 15, 15]
+                            "CdevCeilingFrequency": [3105000, 1396000, 1396000, 1396000, 1396000, 1396000, 1396000]
                         }
                     ]
                 }
@@ -615,8 +587,8 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S4M_VDD_CPUCL0",
-                    "CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
-                    "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+                    "CdevCeilingFrequency": [1950000, 820000, 820000, 820000, 820000, 820000, 820000],
+                    "LimitInfoFrequency": [1950000, 1950000, 1950000, 1950000, 1950000, 820000, 820000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
@@ -624,8 +596,8 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S2M_VDD_CPUCL1",
-                    "CdevCeiling": [0, 13, 13, 13, 14, 16, 16],
-                    "LimitInfo": [0, 0, 0, 0, 0, 16, 16]
+                    "CdevCeilingFrequency": [2600000, 787000, 787000, 787000, 648000, 357000, 357000],
+                    "LimitInfoFrequency": [2600000, 2600000, 2600000, 2600000, 2600000, 357000, 357000]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-2",
@@ -633,8 +605,9 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 2,
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
-                    "CdevCeiling": [0, 17, 17, 17, 17, 17, 17],
-                    "LimitInfo": [0, 0, 0, 0, 0, 17, 17]
+                    "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000],
+                    "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000]
+         
                 },
                 {
                     "CdevRequest": "thermal-gpufreq-0",
@@ -878,17 +851,50 @@
             ]
         },
         {
-            "Name": "VIRTUAL-SKIN-SPEAKER",
+            "Name": "VIRTUAL-SKIN-SPEAKER-LEGACY",
             "Type": "UNKNOWN",
             "Version": "0.1",
+            "Hidden": true,
             "VirtualSensor": true,
-            "TriggerSensor": "usb_conn_therm",
             "Formula": "WEIGHTED_AVG",
             "Combination": ["usb_conn_therm", "maxfg_base"],
             "Coefficient": [0.89, 0.01],
+            "Offset": 8426,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
+            "Type": "UNKNOWN",
+            "Version": "1.0",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "ModelPath": "vt_speaker_estimation_model.tflite",
+            "Formula": "USE_ML_MODEL",
+            "Combination": ["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm",  "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"],
+            "Multiplier": 0.001,
+            "PreviousSampleCount": 3
+        },
+        {
+            "Name": "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-LEGACY"],
+            "Coefficient": [1.0, -1.0],
+            "Multiplier": 1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-SPEAKER",
+            "Type": "UNKNOWN",
+            "Version": "1.0",
+            "VirtualSensor": true,
+            "TriggerSensor": "usb_conn_therm",
+            "Formula": "MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL"],
+            "Coefficient": [1.0],
             "HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "Offset": 8426,
             "Multiplier": 0.001,
             "PollingDelay": 300000,
             "PassiveDelay": 7000,
@@ -1003,23 +1009,41 @@
             "Type": "NPU",
             "HotThreshold": ["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
             "Multiplier": 0.001
+        },
+        {
+            "Name": "STATS-UPDATOR",
+            "Type": "UNKNOWN",
+            "VirtualSensor": true,
+            "Hidden": true,
+            "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm", "usb_conn_therm"],
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
+                            "VIRTUAL-SKIN-SPEAKER-MODEL", "VIRTUAL-SKIN-SPEAKER-LEGACY", "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF"],
+            "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            "Multiplier": 1,
+            "SendPowerHint": true,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
         }
     ],
     "CoolingDevices": [
         {
             "Name": "thermal-cpufreq-0",
             "Type": "CPU",
-            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
+            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
+            "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies"
         },
         {
-            "Name": "thermal-cpufreq-1",
-            "Type": "CPU",
-            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
+            "Name":"thermal-cpufreq-1",
+            "Type":"CPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
+            "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies"
         },
         {
-            "Name": "thermal-cpufreq-2",
-            "Type": "CPU",
-            "WritePath": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
+            "Name":"thermal-cpufreq-2",
+            "Type":"CPU",
+            "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
+            "ScalingAvailableFrequenciesPath": "/sys/devices/system/cpu/cpufreq/policy7/scaling_available_frequencies"
         },
         {
             "Name": "thermal-gpufreq-0",
@@ -1127,8 +1151,8 @@
                     ]
                 },
                 {
-                    "Name": "VIRTUAL-SKIN-SPEAKER",
-                    "Thresholds": [35, 37]
+                    "Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
+                    "Thresholds": [0, 37, 42, 47, 57, 100]
                 }
             ],
             "Abnormality": {
@@ -1142,9 +1166,17 @@
                             "Monitor": ["VIRTUAL-SKIN-MODEL"],
                             "TempRange": [0.0, 57.0]
                         },
+                        {
+                            "Monitor": ["VIRTUAL-SKIN-SPEAKER-MODEL"],
+                            "TempRange": [0.0, 57.0]
+                        },
                         {
                             "Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
-                            "TempRange": [-12000, 12000]
+                            "TempRange": [-7000, 7000]
+                        },
+                        {
+                            "Monitor": ["VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF"],
+                            "TempRange": [-15000, 15000]
                         }
                     ]
                 },
diff --git a/thermal/vt_speaker_estimation_model_comet.tflite b/thermal/vt_speaker_estimation_model_comet.tflite
new file mode 100644
index 0000000..b24da7b
Binary files /dev/null and b/thermal/vt_speaker_estimation_model_comet.tflite differ