diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index df77159..04c3458 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -179,6 +179,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml
 
+# Display Config
+PRODUCT_COPY_FILES += \
+        device/google/tangorpro/tangorpro/display_golden_boe-ts110f5mlg0-rt4_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_boe-ts110f5mlg0-rt4_cal0.pb \
+        device/google/tangorpro/tangorpro/display_golden_csot-ppa957db2d-rt4_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_csot-ppa957db2d-rt4_cal0.pb
+
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 
diff --git a/powerhint.json b/powerhint.json
index 3d93f2f..8b6afcb 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -223,8 +223,7 @@
       "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
       "Values": [
         "0-3",
-        "6-7",
-        "0-7"
+        "6-7"
       ],
       "ResetOnInit": true
     },
@@ -233,8 +232,7 @@
       "Path": "/dev/cpuset/camera-daemon-mid-group/cpus",
       "Values": [
         "0-3",
-        "4-5",
-        "0-7"
+        "4-5"
       ],
       "ResetOnInit": true
     },
@@ -243,8 +241,7 @@
       "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus",
       "Values": [
         "0-3",
-        "4-7",
-        "0-7"
+        "4-7"
       ],
       "ResetOnInit": true
     },
@@ -704,18 +701,18 @@
       "Duration": 1000,
       "Value": "612"
     },
-    {
-      "PowerHint": "CAMERA_LAUNCH",
-      "Node": "CDCpuset",
-      "Duration": 1000,
-      "Value": "4-7"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "NPITaskPacking",
       "Duration": 1000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CDCpuset",
+      "Duration": 1000,
+      "Value": "4-7"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH_EXTENDED",
       "Node": "CPUBigClusterMaxFreq",
@@ -980,24 +977,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "CDHighCpusetCpus",
-      "Duration": 0,
-      "Value": "6-7"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "CDMidCpusetCpus",
-      "Duration": 0,
-      "Value": "4-5"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "CDMidHighCpusetCpus",
-      "Duration": 0,
-      "Value": "4-7"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "NPITaskPacking",
@@ -1064,24 +1043,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CDHighCpusetCpus",
-      "Duration": 0,
-      "Value": "6-7"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CDMidCpusetCpus",
-      "Duration": 0,
-      "Value": "4-5"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CDMidHighCpusetCpus",
-      "Duration": 0,
-      "Value": "4-7"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "NPITaskPacking",
@@ -1142,24 +1103,6 @@
       "Duration": 0,
       "Value": "20 10 80"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDHighCpusetCpus",
-      "Duration": 0,
-      "Value": "6-7"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDMidCpusetCpus",
-      "Duration": 0,
-      "Value": "4-5"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CDMidHighCpusetCpus",
-      "Duration": 0,
-      "Value": "4-7"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "NPITaskPacking",
@@ -1220,24 +1163,6 @@
       "Duration": 0,
       "Value": "20 10 80"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "CDHighCpusetCpus",
-      "Duration": 0,
-      "Value": "6-7"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "CDMidCpusetCpus",
-      "Duration": 0,
-      "Value": "4-5"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "CDMidHighCpusetCpus",
-      "Duration": 0,
-      "Value": "4-7"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "NPITaskPacking",
diff --git a/tangorpro/display_golden_boe-ts110f5mlg0-rt4_cal0.pb b/tangorpro/display_golden_boe-ts110f5mlg0-rt4_cal0.pb
new file mode 100644
index 0000000..72a2fc7
Binary files /dev/null and b/tangorpro/display_golden_boe-ts110f5mlg0-rt4_cal0.pb differ
diff --git a/tangorpro/display_golden_csot-ppa957db2d-rt4_cal0.pb b/tangorpro/display_golden_csot-ppa957db2d-rt4_cal0.pb
new file mode 100644
index 0000000..61d604a
Binary files /dev/null and b/tangorpro/display_golden_csot-ppa957db2d-rt4_cal0.pb differ
diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index 149f6e4..eb822e0 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -49,8 +49,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["neutral_therm", "quiet_therm", "charger_skin_therm", "disp_therm"],
-            "Coefficient":["-0.74", "1.42", "0.06", "0.12"],
-            "Offset":60,
+            "Coefficient":["-0.484", "1.081", "0.093", "-0.003"],
+            "Offset":6435,
             "Multiplier":0.001
         },
         {
@@ -60,8 +60,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["neutral_therm", "quiet_therm", "charger_skin_therm", "disp_therm"],
-            "Coefficient":["-0.01", "0.01", "-0.02", "1.00"],
-            "Offset":1140,
+            "Coefficient":["0.132", "-0.195", "0.006", "0.975"],
+            "Offset":2769,
             "Multiplier":0.001
         },
         {
@@ -71,8 +71,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["neutral_therm", "quiet_therm", "charger_skin_therm", "disp_therm"],
-            "Coefficient":["-0.54", "1.18", "0.20", "0.13"],
-            "Offset":-2210,
+            "Coefficient":["-0.120", "0.785", "0.153", "-0.079"],
+            "Offset":5971,
             "Multiplier":0.001
         },
         {
@@ -82,8 +82,8 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":["neutral_therm", "quiet_therm", "charger_skin_therm", "disp_therm"],
-            "Coefficient":["-0.68", "1.45", "0.07", "0.16"],
-            "Offset":-3440,
+            "Coefficient":["-0.148", "0.666", "0.256", "-0.079"],
+            "Offset":7137,
             "Multiplier":0.001
         },
         {