diff --git a/device-cheetah.mk b/device-cheetah.mk
index 784ca55..8dc92a6 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -248,7 +248,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.gms.dck.eligible_wcc=2
+    ro.gms.dck.eligible_wcc=3
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/location/gps.xml b/location/gps.xml
index d0fcfdb..12ef997 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index b119e7f..a561310 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index 760d30b..754864f 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 266b53b..0a2edae 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index d9ca029..15db757 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index 53fe55c..39fddfc 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index d82a559..2a03428 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -62,8 +62,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["gnss_tcxo_therm", "disp_therm"],
-            "Coefficient":[0.550, 0.450],
-            "Offset":-1000,
+            "Coefficient":[0.580, 0.420],
+            "Offset":-450,
             "Multiplier":0.001
         },
         {
@@ -113,7 +113,7 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.7",
+            "Version":"1.1",
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 442d2e9..43b0e55 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -113,7 +113,7 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.7",
+            "Version":"1.1",
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",