diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index db6022c..abda3b0 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -9,6 +9,8 @@ gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
+MaxNtnRefLocAgeSecs=600
+GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
 gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc
 gnss_device_data_port_chpp_present=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index a9d2050..ad41688 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -24,6 +24,7 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
+MaxNtnRefLocAgeSecs=600
 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
 #Chip_Configuration_Io_Options=0x9
 # enable DEBUG sync msg
@@ -33,6 +34,7 @@ caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 #Chip_Configuration_cpdbgsync=1
 
 # Chip_Configuration_TrackerDebugMode = 0x10
+GlueLayer_IsPlatformRefTimeEnable=1
 
 # enables CHPP for SPI port
 # uncomment the *chpp* lines below (and comment gnss_device-data_port_kepslim_present above) to use SPI+CHPP
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 5a4b655..052208e 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -2734,12 +2734,24 @@
       "Duration": 2000,
       "Value": "44"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PowerHALCameraRunning",
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "PMU_LIT_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1098000"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_LCPI_THRESHOLD",
@@ -2750,7 +2762,13 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "0"
+      "Value": "42"
+    },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "PMU_MID_LIMIT_FREQ",
+      "Duration": 0,
+      "Value": "1328000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -2762,13 +2780,13 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "18"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1885000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -2780,25 +2798,25 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "50"
+      "Value": "22"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_POLL",
       "Duration": 0,
-      "Value": "0"
+      "Value": "1"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "EM_Profile",
       "Duration": 0,
-      "Value": "cam1"
+      "Value": "cam2"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CDPreferHighCap",
       "Duration": 0,
-      "Value": "1"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -2810,25 +2828,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "TAPreferHighCap",
       "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1885000"
-    },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1549000"
-    },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1425000"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -2860,6 +2860,18 @@
       "Duration": 0,
       "Value": "0-7"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "VIRTUAL-SKIN-CPU-MID",
+      "Duration": 0,
+      "Value": "camera"
+    },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "VIRTUAL-SKIN-CPU-HIGH",
+      "Duration": 0,
+      "Value": "camera"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "MIFTargetLoad",
@@ -2880,7 +2892,7 @@
       "PID_Do": 500.0,
       "PID_Du": 0.0,
       "UclampMin_On": true,
-      "UclampMin_Init": 231,
+      "UclampMin_Init": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
@@ -2904,7 +2916,7 @@
       "PID_Do": 500.0,
       "PID_Du": 0.0,
       "UclampMin_On": true,
-      "UclampMin_Init": 231,
+      "UclampMin_Init": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
@@ -2928,7 +2940,7 @@
       "PID_Do": 500.0,
       "PID_Du": 0.0,
       "UclampMin_On": true,
-      "UclampMin_Init": 231,
+      "UclampMin_Init": 480,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,