diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index 01851059..b264c94d 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -800,13 +800,23 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_WIRED_CHARGE",
+            "Name":"WLC_CHECK",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["thb_hda"],
-            "Coefficient":[-1],
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[1, -51],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WLC",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[-2],
             "Multiplier":1
         },
         {
@@ -817,7 +827,7 @@
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"WEIGHTED_AVG",
             "Combination":["VIRTUAL-SKIN-CHARGE"],
-            "Coefficient":["IS_WIRED_CHARGE"],
+            "Coefficient":["NO_WLC"],
             "CoefficientType": ["SENSOR"],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json
index 647f240b..128bd6ef 100644
--- a/thermal/thermal_info_config_charge_caiman.json
+++ b/thermal/thermal_info_config_charge_caiman.json
@@ -137,13 +137,23 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_WIRED_CHARGE",
+            "Name":"WLC_CHECK",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["thb_hda"],
-            "Coefficient":[-1],
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[1, -51],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WLC",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[-2],
             "Multiplier":1
         },
         {
@@ -154,7 +164,7 @@
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"WEIGHTED_AVG",
             "Combination":["VIRTUAL-SKIN-CHARGE"],
-            "Coefficient":["IS_WIRED_CHARGE"],
+            "Coefficient":["NO_WLC"],
             "CoefficientType": ["SENSOR"],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json
index 43e12c1a..e198b676 100644
--- a/thermal/thermal_info_config_charge_komodo.json
+++ b/thermal/thermal_info_config_charge_komodo.json
@@ -137,13 +137,23 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_WIRED_CHARGE",
+            "Name":"WLC_CHECK",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["thb_hda"],
-            "Coefficient":[-1],
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[1, -51],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WLC",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[-2],
             "Multiplier":1
         },
         {
@@ -154,7 +164,7 @@
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"WEIGHTED_AVG",
             "Combination":["VIRTUAL-SKIN-CHARGE"],
-            "Coefficient":["IS_WIRED_CHARGE"],
+            "Coefficient":["NO_WLC"],
             "CoefficientType": ["SENSOR"],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json
index ab492166..80ec6191 100644
--- a/thermal/thermal_info_config_charge_tokay.json
+++ b/thermal/thermal_info_config_charge_tokay.json
@@ -159,13 +159,23 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_WIRED_CHARGE",
+            "Name":"WLC_CHECK",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["thb_hda"],
-            "Coefficient":[-1],
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[1, -51],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WLC",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[-2],
             "Multiplier":1
         },
         {
@@ -176,7 +186,7 @@
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"WEIGHTED_AVG",
             "Combination":["VIRTUAL-SKIN-CHARGE"],
-            "Coefficient":["IS_WIRED_CHARGE"],
+            "Coefficient":["NO_WLC"],
             "CoefficientType": ["SENSOR"],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json
index a3adb6ec..09df8723 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -798,13 +798,23 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_WIRED_CHARGE",
+            "Name":"WLC_CHECK",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["thb_hda"],
-            "Coefficient":[-1],
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[1, -51],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WLC",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[-2],
             "Multiplier":1
         },
         {
@@ -815,7 +825,7 @@
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"WEIGHTED_AVG",
             "Combination":["VIRTUAL-SKIN-CHARGE"],
-            "Coefficient":["IS_WIRED_CHARGE"],
+            "Coefficient":["NO_WLC"],
             "CoefficientType": ["SENSOR"],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json
index 39106fda..fef7e9c1 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -858,13 +858,23 @@
             "Multiplier":1
         },
         {
-            "Name":"IS_WIRED_CHARGE",
+            "Name":"WLC_CHECK",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["thb_hda"],
-            "Coefficient":[-1],
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[1, -51],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WLC",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[-2],
             "Multiplier":1
         },
         {
@@ -875,7 +885,7 @@
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"WEIGHTED_AVG",
             "Combination":["VIRTUAL-SKIN-CHARGE"],
-            "Coefficient":["IS_WIRED_CHARGE"],
+            "Coefficient":["NO_WLC"],
             "CoefficientType": ["SENSOR"],
             "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],