diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 27121d2..3b63018 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -1051,6 +1051,306 @@
             "SendPowerHint": true,
             "PollingDelay": 300000,
             "PassiveDelay": 7000
+        },
+        {
+            "Name": "IS_WLC_WITHOUT_STEP_RATIO",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[2],
+            "Multiplier":1
+        },
+        {
+            "Name": "NO_WLC_WITHOUT_STEP_RATIO",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["WLC_CHECK"],
+            "Coefficient":[-2],
+            "Multiplier":1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS",
+            "Type":"UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", -1000000],
+            "CombinationType": ["SENSOR", "CONSTANT"],
+            "Coefficient":["IS_WLC_WITHOUT_STEP_RATIO", "NO_WLC_WITHOUT_STEP_RATIO"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "IS_WIRED_SUB5W_CHECK",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[51, -52],
+            "Multiplier":1
+        },
+        {
+            "Name":"IS_WIRED_SUB5W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_SUB5W_CHECK"],
+            "Coefficient":[2],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WIRED_SUB5W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_SUB5W_CHECK"],
+            "Coefficient":[-2],
+            "Multiplier":1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-SUB5W-STATS",
+            "Type":"UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000],
+            "CombinationType": ["SENSOR", "CONSTANT"],
+            "Coefficient":["IS_WIRED_SUB5W", "NO_WIRED_SUB5W"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "IS_WIRED_5W_CHECK",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[52, -53],
+            "Multiplier":1
+        },
+        {
+            "Name":"IS_WIRED_5W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_5W_CHECK"],
+            "Coefficient":[2],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WIRED_5W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_5W_CHECK"],
+            "Coefficient":[-2],
+            "Multiplier":1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-5W-STATS",
+            "Type":"UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000],
+            "CombinationType": ["SENSOR", "CONSTANT"],
+            "Coefficient":["IS_WIRED_5W", "NO_WIRED_5W"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "IS_WIRED_7_5W_CHECK",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[53, -54],
+            "Multiplier":1
+        },
+        {
+            "Name":"IS_WIRED_7_5W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_7_5W_CHECK"],
+            "Coefficient":[2],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WIRED_7_5W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_7_5W_CHECK"],
+            "Coefficient":[-2],
+            "Multiplier":1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-7-5W-STATS",
+            "Type":"UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000],
+            "CombinationType": ["SENSOR", "CONSTANT"],
+            "Coefficient":["IS_WIRED_7_5W", "NO_WIRED_7_5W"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "IS_WIRED_15W_CHECK",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[54, -55],
+            "Multiplier":1
+        },
+        {
+            "Name":"IS_WIRED_15W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_15W_CHECK"],
+            "Coefficient":[2],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WIRED_15W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_15W_CHECK"],
+            "Coefficient":[-2],
+            "Multiplier":1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-15W-STATS",
+            "Type":"UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000],
+            "CombinationType": ["SENSOR", "CONSTANT"],
+            "Coefficient":["IS_WIRED_15W", "NO_WIRED_15W"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "IS_WIRED_18W_CHECK",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[55, -56],
+            "Multiplier":1
+        },
+        {
+            "Name":"IS_WIRED_18W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_18W_CHECK"],
+            "Coefficient":[2],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WIRED_18W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_18W_CHECK"],
+            "Coefficient":[-2],
+            "Multiplier":1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-18W-STATS",
+            "Type":"UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000],
+            "CombinationType": ["SENSOR", "CONSTANT"],
+            "Coefficient":["IS_WIRED_18W", "NO_WIRED_18W"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "IS_WIRED_GT18W_CHECK",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["thb_hda", "thb_hda"],
+            "Coefficient":[56, -57],
+            "Multiplier":1
+        },
+        {
+            "Name":"IS_WIRED_GT18W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_GT18W_CHECK"],
+            "Coefficient":[2],
+            "Multiplier":1
+        },
+        {
+            "Name":"NO_WIRED_GT18W",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["IS_WIRED_GT18W_CHECK"],
+            "Coefficient":[-2],
+            "Multiplier":1
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-GT18W-STATS",
+            "Type":"UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WIRED-EQ", -1000000],
+            "CombinationType": ["SENSOR", "CONSTANT"],
+            "Coefficient":["IS_WIRED_GT18W", "NO_WIRED_GT18W"],
+            "CoefficientType": ["SENSOR", "SENSOR"],
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "CHARGING-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-CHARGE-DURING-WLC-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-SUB5W-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-5W-STATS",
+                "VIRTUAL-SKIN-CHARGE-DURING-WIRED-7-5W-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-15W-STATS", "VIRTUAL-SKIN-CHARGE-DURING-WIRED-18W-STATS",
+                "VIRTUAL-SKIN-CHARGE-DURING-WIRED-GT18W-STATS"],
+            "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            "Multiplier": 1,
+            "SendPowerHint": true,
+            "PollingDelay": 300000,
+            "PassiveDelay": 7000
         }
     ],
     "CoolingDevices": [
@@ -1194,6 +1494,34 @@
                 {
                     "Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
                     "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS",
+                    "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-SUB5W-STATS",
+                    "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-5W-STATS",
+                    "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-7-5W-STATS",
+                    "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-15W-STATS",
+                    "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-18W-STATS",
+                    "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-CHARGE-DURING-WIRED-GT18W-STATS",
+                    "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55]
                 }
             ],
             "Abnormality": {