diff --git a/felix/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/felix/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 2a53b55..9b3e461 100644
--- a/felix/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/felix/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -26,7 +26,7 @@
     <device name="cp2ap_wakeup">
         <subsystem>Cellular_data</subsystem>
     </device>
-    <device name="MAILBOX_AOCF12APxE00">
+    <device name="MAILBOX_AOCF12APx1100">
         <subsystem>Sound_trigger</subsystem>
     </device>
     <device name="MAILBOX_AOCA322APx100">
diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json
index ca67d3d..ceb9181 100644
--- a/thermal_info_config_charge_felix.json
+++ b/thermal_info_config_charge_felix.json
@@ -79,36 +79,15 @@
             "Coefficient":[-1.0],
             "Multiplier":1
         },
-        {
-            "Name":"CLOSE-SUB1-RAW",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
-            "Coefficient":[-0.15, -0.45, 0.2, 1.5],
-            "Offset":-670,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"CLOSE-SUB1",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"MINIMUM",
-            "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
-            "Coefficient":[1.0, 49000.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"CLOSE-SUB2",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
-            "Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
-            "Offset":2500,
+            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
+            "Coefficient":[0.259, 0.652, -0.161, 0.03],
+            "Offset":8450,
             "Multiplier":0.001
         },
         {
@@ -161,8 +140,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"MAXIMUM",
-            "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
@@ -192,9 +171,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
-            "Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
-            "Offset":-990,
+            "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
+            "Coefficient":[0.385, 0.075, 0.348, 0.302],
+            "Offset":-4950,
             "Multiplier":0.001
         },
         {
diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index fc06b02..6bbb5b0 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -85,36 +85,15 @@
             "Coefficient":[-1.0],
             "Multiplier":1
         },
-        {
-            "Name":"CLOSE-SUB1-RAW",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
-            "Coefficient":[-0.15, -0.45, 0.2, 1.5],
-            "Offset":-670,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"CLOSE-SUB1",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"MINIMUM",
-            "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
-            "Coefficient":[1.0, 49000.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"CLOSE-SUB2",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
-            "Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
-            "Offset":2500,
+            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
+            "Coefficient":[0.259, 0.652, -0.161, 0.03],
+            "Offset":8450,
             "Multiplier":0.001
         },
         {
@@ -167,8 +146,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"MAXIMUM",
-            "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
@@ -198,9 +177,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
-            "Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
-            "Offset":-990,
+            "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
+            "Coefficient":[0.385, 0.075, 0.348, 0.302],
+            "Offset":-4950,
             "Multiplier":0.001
         },
         {
diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index bd7b388..1b7c446 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -85,36 +85,15 @@
             "Coefficient":[-1.0],
             "Multiplier":1
         },
-        {
-            "Name":"CLOSE-SUB1-RAW",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
-            "Coefficient":[-0.15, -0.45, 0.2, 1.5],
-            "Offset":-670,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"CLOSE-SUB1",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"MINIMUM",
-            "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
-            "Coefficient":[1.0, 49000.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"CLOSE-SUB2",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
-            "Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
-            "Offset":2500,
+            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
+            "Coefficient":[0.259, 0.652, -0.161, 0.03],
+            "Offset":8450,
             "Multiplier":0.001
         },
         {
@@ -167,8 +146,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"MAXIMUM",
-            "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
@@ -198,9 +177,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
-            "Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
-            "Offset":-990,
+            "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
+            "Coefficient":[0.385, 0.075, 0.348, 0.302],
+            "Offset":-4950,
             "Multiplier":0.001
         },
         {