diff --git a/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 6242a6c..dd14f6a 100644
--- a/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -23,12 +23,12 @@
       <value>3</value> <!-- Cluster 1 has 3 cores (cpu4, cpu5, cpu6) -->
       <value>1</value> <!-- Cluster 2 has 1 cores (cpu7) -->
     </array>
-    <item name="cpu.suspend">10</item>
-    <item name="cpu.idle">28.6</item>
-    <item name="cpu.active">12.37</item>
-    <item name="cpu.cluster_power.cluster0">0.24</item>
-    <item name="cpu.cluster_power.cluster1">3.23</item>
-    <item name="cpu.cluster_power.cluster2">5.94</item>
+    <item name="cpu.suspend">9.28</item>
+    <item name="cpu.idle">22.71</item>
+    <item name="cpu.active">10.62</item>
+    <item name="cpu.cluster_power.cluster0">0</item>
+    <item name="cpu.cluster_power.cluster1">1.12</item>
+    <item name="cpu.cluster_power.cluster2">2.2</item>
     <!-- Different CPU speeds as reported in
          /sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
     <array name="cpu.core_speeds.cluster0">
@@ -91,61 +91,61 @@
     <!-- Additional power used by a CPU core from cluster 0 when running at
          different speeds, excluding cluster and active cost -->
     <array name="cpu.core_power.cluster0">
-      <value>1.89</value> <!-- 324 MHz CPU speed -->
-      <value>6.15</value> <!-- 610 MHz CPU speed -->
-      <value>9.34</value> <!-- 820 MHz CPU speed -->
-      <value>14.22</value> <!-- 955 MHz CPU speed -->
-      <value>18.94</value> <!-- 1098 MHz CPU speed -->
-      <value>21.98</value> <!-- 1197 MHz CPU speed -->
-      <value>26.83</value> <!-- 1328 MHz CPU speed -->
-      <value>30.17</value> <!-- 1425 MHz CPU speed -->
-      <value>41.55</value> <!-- 1548 MHz CPU speed -->
-      <value>48.36</value> <!-- 1696 MHz CPU speed -->
-      <value>58.45</value> <!-- 1849 MHz CPU speed -->
-      <value>68</value> <!-- 1950 MHz CPU speed -->
+      <value>1.27</value> <!-- 324 MHz CPU speed-->
+      <value>5.87</value> <!-- 610 MHz CPU speed-->
+      <value>6.5</value> <!-- 820 MHz CPU speed-->
+      <value>7.93</value> <!-- 955 MHz CPU speed-->
+      <value>10.5</value> <!-- 1098 MHz CPU speed-->
+      <value>14.06</value> <!-- 1197 MHz CPU speed-->
+      <value>16.18</value> <!-- 1328 MHz CPU speed-->
+      <value>17.65</value> <!-- 1425 MHz CPU speed-->
+      <value>20.92</value> <!-- 1548 MHz CPU speed-->
+      <value>24.67</value> <!-- 1696 MHz CPU speed-->
+      <value>34.09</value> <!-- 1849 MHz CPU speed-->
+      <value>47.41</value> <!-- 1950 MHz CPU speed-->
     </array>
     <!-- Additional power used by a CPU core from cluster 1 when running at
          different speeds, excluding cluster and active cost -->
     <array name="cpu.core_power.cluster1">
-      <value>6.5</value> <!-- 357 MHz CPU speed-->
-      <value>10</value> <!-- 578 MHz CPU speed-->
-      <value>11</value> <!-- 648 MHz CPU speed-->
-      <value>13.75</value> <!-- 787 MHz CPU speed-->
-      <value>15.75</value> <!-- 910 MHz CPU speed-->
-      <value>19.25</value> <!-- 1065 MHz CPU speed-->
-      <value>23.75</value> <!-- 1221 MHz CPU speed-->
-      <value>26.25</value> <!-- 1328 MHz CPU speed-->
-      <value>29.75</value> <!-- 1418 MHz CPU speed-->
-      <value>35</value> <!-- 1549 MHz CPU speed-->
-      <value>47.5</value> <!-- 1795 MHz CPU speed-->
-      <value>58</value> <!-- 1945 MHz CPU speed-->
-      <value>72.25</value> <!-- 2130 MHz CPU speed-->
-      <value>82.5</value> <!-- 2245 MHz CPU speed-->
-      <value>94</value> <!-- 2367 MHz CPU speed-->
-      <value>103.5</value> <!-- 2450 MHz CPU speed-->
-      <value>126</value> <!-- 2600 MHz CPU speed-->
+      <value>5.4</value> <!-- 357 MHz CPU speed-->
+      <value>8.9</value> <!-- 578 MHz CPU speed-->
+      <value>9.9</value> <!-- 648 MHz CPU speed-->
+      <value>12.65</value> <!-- 787 MHz CPU speed-->
+      <value>14.65</value> <!-- 910 MHz CPU speed-->
+      <value>18.15</value> <!-- 1065 MHz CPU speed-->
+      <value>22.65</value> <!-- 1221 MHz CPU speed-->
+      <value>25.15</value> <!-- 1328 MHz CPU speed-->
+      <value>28.65</value> <!-- 1418 MHz CPU speed-->
+      <value>33.9</value> <!-- 1549 MHz CPU speed-->
+      <value>46.4</value> <!-- 1795 MHz CPU speed-->
+      <value>56.9</value> <!-- 1945 MHz CPU speed-->
+      <value>71.15</value> <!-- 2130 MHz CPU speed-->
+      <value>81.4</value> <!-- 2245 MHz CPU speed-->
+      <value>92.9</value> <!-- 2367 MHz CPU speed-->
+      <value>102.4</value> <!-- 2450 MHz CPU speed-->
+      <value>124.9</value> <!-- 2600 MHz CPU speed-->
     </array>
     <!-- Additional power used by a CPU core from cluster 2 when running at
          different speeds, excluding cluster and active cost -->
     <array name="cpu.core_power.cluster2">
-      <value>19.11</value> <!-- 700 MHz CPU speed-->
-      <value>32.04</value> <!-- 1164 MHz CPU speed-->
-      <value>41.8</value> <!-- 1296 MHz CPU speed-->
-      <value>50.05</value> <!-- 1557 MHz CPU speed-->
-      <value>60.23</value> <!-- 1745 MHz CPU speed-->
-      <value>69.16</value> <!-- 1885 MHz CPU speed-->
-      <value>76.86</value> <!-- 1999 MHz CPU speed-->
-      <value>89.65</value> <!-- 2147 MHz CPU speed-->
-      <value>104.23</value> <!-- 2294 MHz CPU speed-->
-      <value>113.03</value> <!-- 2363 MHz CPU speed-->
-      <value>132.83</value> <!-- 2499 MHz CPU speed-->
-      <value>167.61</value> <!-- 2687 MHz CPU speed-->
-      <value>195.94</value> <!-- 2802 MHz CPU speed-->
-      <value>231.41</value> <!-- 2914 MHz CPU speed-->
-      <value>240.35</value> <!-- 2943 MHz CPU speed-->
-      <value>246.54</value> <!-- 2970 MHz CPU speed-->
-      <value>253.55</value> <!-- 3015 MHz CPU speed-->
-      <value>256.03</value> <!-- 3105 MHz CPU speed-->
+      <value>16.91</value> <!-- 700 MHz CPU speed-->
+      <value>29.84</value> <!-- 1164 MHz CPU speed-->
+      <value>39.6</value> <!-- 1296 MHz CPU speed-->
+      <value>47.85</value> <!-- 1557 MHz CPU speed-->
+      <value>58.03</value> <!-- 1745 MHz CPU speed-->
+      <value>66.96</value> <!-- 1885 MHz CPU speed-->
+      <value>74.66</value> <!-- 1999 MHz CPU speed-->
+      <value>87.45</value> <!-- 2147 MHz CPU speed-->
+      <value>102.03</value> <!-- 2294 MHz CPU speed-->
+      <value>110.83</value> <!-- 2363 MHz CPU speed-->
+      <value>130.63</value> <!-- 2499 MHz CPU speed-->
+      <value>165.41</value> <!-- 2687 MHz CPU speed-->
+      <value>193.74</value> <!-- 2802 MHz CPU speed-->
+      <value>229.21</value> <!-- 2914 MHz CPU speed-->
+      <value>238.15</value> <!-- 2943 MHz CPU speed-->
+      <value>244.34</value> <!-- 2970 MHz CPU speed-->
+      <value>251.35</value> <!-- 3015 MHz CPU speed-->
+      <value>253.83</value> <!-- 3105 MHz CPU speed-->
     </array>
     <!-- Additional power used when screen is ambient mode -->
     <item name="ambient.on">32</item>
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 33da69e..ea20559 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -21,8 +21,6 @@ ChipCfg_VDR_low_end_Time = 20
 Chip_Configuration_AidingConfiguration=0x00020046
 Chip_Configuration_RefClkControl=0x24
 Chip_Configuration_DCXO_CrystalType=0x11
-Chip_Configuration_GNSSConstConstraintDef = 0x60BF
-LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
 sbasUsedInUSPolicy=2
@@ -65,6 +63,7 @@ isUseUncalAccel=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 3d631ad..074837c 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -90,9 +90,6 @@ Chip_Configuration_DCXO_CrystalType=0x11
 #    Range should be 2000 to 3100
 #Chip_Configuration_DCXO_InflectionPoint=2855
 
-# L1 + L5 MCW
-Chip_Configuration_GNSSConstConstraintDef = 0x60BF
-LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 
 ### 2C48 L1 only MCW ###
@@ -198,6 +195,7 @@ isUseUncalAccel=1
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1
diff --git a/powerhint-comet.json b/powerhint-comet.json
index c5fe44a..669e27c 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -237,9 +237,10 @@
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
       "Values": [
+        "2048 1280 1280",
         "1280",
         "1100",
-        "1100 1024 1100"
+        "1100 1078 1024"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -250,7 +251,7 @@
       "Values": [
         "1280",
         "1100",
-        "1280 1100 1055"
+        "1100 1078 1024"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -1717,7 +1718,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1078 1024"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1791,6 +1792,12 @@
       "Duration": 0,
       "Value": "700000"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1863,18 +1870,6 @@
       "Duration": 0,
       "Value": "cam2"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUUtilThreshold",
-      "Duration": 0,
-      "Value": "1100 1024 1100"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUDVFSHeadroom",
-      "Duration": 0,
-      "Value": "1280 1100 1055"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
@@ -1935,12 +1930,24 @@
       "Duration": 0,
       "Value": "camera"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1280"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CDPreferHighCap",
@@ -2111,13 +2118,13 @@
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUUtilThreshold",
+      "Node": "CPUDVFSHeadroom",
       "Duration": 0,
       "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUDVFSHeadroom",
+      "Node": "CPUUtilThreshold",
       "Duration": 0,
       "Value": "1100"
     },