diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index a5d8e60..559439f 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -328,6 +328,8 @@
   <ctl name="Decoder Reference Enable" value="0" />
   <ctl name="LVM Enable" value="0" />
 
+  <ctl name="MultiChannel Processor Switch" value="0" />
+
   <!-- sidetone dynamic control -->
   <path name="sidetone-for handset">
     <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -873,6 +875,8 @@
   </path>
 
   <path name="spatializer-offload-playback -> speaker">
+    <!-- Nx Module id: 42 -->
+    <ctl name="MultiChannel Processor Switch" value="42" />
     <ctl name="TDM_0_RX Mixer EP4" value="1" />
   </path>
 
@@ -889,6 +893,8 @@
   </path>
 
   <path name="spatializer-offload-playback -> bt">
+    <!-- Auxel Module id: 27 -->
+    <ctl name="MultiChannel Processor Switch" value="27" />
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
@@ -1298,6 +1304,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
@@ -1332,6 +1342,10 @@
     <path name="microphones (VOICE)" />
   </path>
 
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
+  </path>
+
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>
diff --git a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so
index b9f43a7..d9e5675 100644
Binary files a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ
diff --git a/audio/comet/tuning/waves/waves_config.ini b/audio/comet/tuning/waves/waves_config.ini
index ad00ce9..7b40042 100644
--- a/audio/comet/tuning/waves/waves_config.ini
+++ b/audio/comet/tuning/waves/waves_config.ini
@@ -63,26 +63,26 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_257]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3:0,PRESET:SPEAKER_MUSIC_FOLDED
-CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:0|3:1,PRESET:SPEAKER_MUSIC_FOLDED_NX
-CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:1|2:1:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_NX
-CASE_5=PRIORITY:4,NUMBERS:2:0|1:1|2:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED
-CASE_6=PRIORITY:5,NUMBERS:2:0|1:1|2:2:1,PRESET:SPEAKER_MUSIC_UNFOLDED_NX
-CASE_7=PRIORITY:6,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
-CASE_8=PRIORITY:7,NUMBERS:1|4194304:0|1:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC
-CASE_9=PRIORITY:8,NUMBERS:2:0|1:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE
-CASE_10=PRIORITY:9,NUMBERS:2:0|1:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE_NX
-CASE_11=PRIORITY:10,NUMBERS:2:0|1:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE
-CASE_12=PRIORITY:11,NUMBERS:2:0|1:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE_NX
-CASE_13=PRIORITY:12,NUMBERS:2:0|1:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE
-CASE_14=PRIORITY:13,NUMBERS:2:0|1:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE_NX
-CASE_15=PRIORITY:14,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
-CASE_16=PRIORITY:15,NUMBERS:1|4194304:0|1:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0|3:0,PRESET:SPEAKER_MUSIC_FOLDED
+CASE_2=PRIORITY:1,NUMBERS:2:0|1|4:1|2:0|3:1,PRESET:SPEAKER_MUSIC_FOLDED_NX
+CASE_3=PRIORITY:2,NUMBERS:2:0|1|4:1|2:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL
+CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:1|2:1:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_NX
+CASE_5=PRIORITY:4,NUMBERS:2:0|1|4:1|2:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED
+CASE_6=PRIORITY:5,NUMBERS:2:0|1|4:1|2:2:1,PRESET:SPEAKER_MUSIC_UNFOLDED_NX
+CASE_7=PRIORITY:6,NUMBERS:1|2|4194304:2|3:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_8=PRIORITY:7,NUMBERS:1|4194304:0|1|4:1|2:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_9=PRIORITY:8,NUMBERS:2:0|1|4:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE
+CASE_10=PRIORITY:9,NUMBERS:2:0|1|4:0:0|3:0|1,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE_NX
+CASE_11=PRIORITY:10,NUMBERS:2:0|1|4:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE
+CASE_12=PRIORITY:11,NUMBERS:2:0|1|4:0:1:0,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE_NX
+CASE_13=PRIORITY:12,NUMBERS:2:0|1|4:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE
+CASE_14=PRIORITY:13,NUMBERS:2:0|1|4:0:2:0,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE_NX
+CASE_15=PRIORITY:14,NUMBERS:1|2|4194304:2|3:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_16=PRIORITY:15,NUMBERS:1|4194304:0|1|4:0:0|1|2|3:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
 
 # Action 257 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t
 # - audio_devices_t : current active device
-# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - folded_type_t: 0 - Close, 1 -Clamshell, 2 - Open, 3 - unknown
 # - sound_usage_t: 0 - NX_off, 1 - NX_on
diff --git a/bluetooth/bluetooth_power_limits_comet.csv b/bluetooth/bluetooth_power_limits_comet.csv
index d516bb6..0ebad18 100644
--- a/bluetooth/bluetooth_power_limits_comet.csv
+++ b/bluetooth/bluetooth_power_limits_comet.csv
@@ -1,71 +1,71 @@
 Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
-off,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
-off,off,off,off,off,on,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
-off,off,off,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,off,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,off,on,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
-off,off,off,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,off,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,off,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,off,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,off,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,off,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,off,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,on,off,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,on,off,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,on,on,off,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,on,on,on,on,on,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,on,off,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,off,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,off,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,off,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,off,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,off,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,off,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,off,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,off,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,off,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,off,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,off,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,on,off,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,on,off,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,on,on,off,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,on,on,on,on,on,any,72,68,72,68,40,40,40,40,40,40,40,40,40,40,40,40
-off,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
-off,off,on,any,off,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-off,off,off,any,on,any,off,78,68,78,68,68,68,68,68,66,56,66,56,66,56,66,56
-on,off,off,off,off,off,on,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
-on,off,off,off,off,on,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
-on,off,off,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,off,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,off,on,off,off,on,78,68,78,68,76,68,76,68,66,56,66,56,66,56,66,56
-on,off,off,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,off,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,off,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,off,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,off,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,off,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,off,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,on,off,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,on,off,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,on,on,off,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,on,on,on,on,on,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,on,off,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,off,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,off,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,off,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,off,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,off,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,off,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,on,off,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,off,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,on,on,on,on,on,any,78,68,78,68,50,50,50,50,50,50,50,50,50,50,50,50
-on,off,off,any,off,any,off,78,68,78,68,78,68,78,68,66,56,66,56,66,56,66,56
-on,off,on,any,off,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
-on,off,off,any,on,any,off,78,68,78,68,62,62,62,62,62,56,62,56,62,56,62,56
+off,off,off,off,off,off,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52
+off,off,off,off,off,on,on,66,64,34,64,62,62,34,62,54,52,22,52,54,52,22,52
+off,off,off,off,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,off,off,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,off,on,off,off,on,66,64,34,64,62,62,34,62,54,52,22,52,60,52,22,52
+off,off,off,on,off,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,off,on,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,off,on,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,off,off,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,off,off,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,off,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,off,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,on,off,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,on,off,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,on,on,off,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,off,on,on,on,on,on,66,64,34,64,50,50,34,50,46,46,22,46,46,46,22,46
+off,on,off,off,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,off,off,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,off,off,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,off,off,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,off,on,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,off,on,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,off,on,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,off,on,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,off,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,off,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,off,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,off,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,on,off,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,on,off,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,on,on,off,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,on,on,on,on,on,any,58,58,34,58,30,30,34,30,26,26,22,26,26,26,22,26
+off,off,off,any,off,any,off,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52
+off,off,on,any,off,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+off,off,off,any,on,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,off,off,off,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,off,off,on,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,off,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,off,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,on,off,off,on,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,on,off,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,on,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,on,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,off,off,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,off,off,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,off,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,off,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,on,off,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,on,off,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,on,on,off,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,on,on,on,on,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,on,off,off,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,off,off,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,off,off,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,off,off,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,off,on,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,off,on,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,off,on,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,off,on,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,off,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,off,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,off,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,off,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,on,off,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,on,off,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,on,on,off,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,on,on,on,on,on,any,66,64,34,64,50,50,34,50,50,50,22,50,50,50,22,50
+on,off,off,any,off,any,off,66,64,34,64,66,64,34,64,54,52,22,52,54,52,22,52
+on,off,on,any,off,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
+on,off,off,any,on,any,off,66,64,34,64,64,64,34,64,54,52,22,52,54,52,22,52
diff --git a/bluetooth/bluetooth_power_limits_comet_CE.csv b/bluetooth/bluetooth_power_limits_comet_CE.csv
deleted file mode 100644
index 5aef29d..0000000
--- a/bluetooth/bluetooth_power_limits_comet_CE.csv
+++ /dev/null
@@ -1,71 +0,0 @@
-Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
-off,off,off,off,off,off,on,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,off,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,off,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,off,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,on,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,on,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,on,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,on,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,off,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,off,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,off,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,off,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,on,off,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,on,off,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,on,on,off,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,on,on,on,on,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,off,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,on,on,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,any,off,any,off,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
-off,off,on,any,off,any,off,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-off,off,off,any,on,any,off,78,68,30,68,74,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,off,off,off,on,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,off,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,off,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,off,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,on,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,on,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,on,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,on,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,off,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,off,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,off,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,off,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,on,off,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,on,off,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,on,on,off,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,on,on,on,on,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,off,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,off,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,off,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,off,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,off,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,on,off,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,on,off,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,on,on,off,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,on,on,on,on,on,any,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,any,off,any,off,78,68,30,68,78,68,30,68,66,56,18,56,66,56,18,56
-on,off,on,any,off,any,off,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
-on,off,off,any,on,any,off,78,68,30,68,68,68,30,68,66,56,18,56,66,56,18,56
diff --git a/bluetooth/bluetooth_power_limits_comet_EU.csv b/bluetooth/bluetooth_power_limits_comet_EU.csv
new file mode 100644
index 0000000..798da83
--- /dev/null
+++ b/bluetooth/bluetooth_power_limits_comet_EU.csv
@@ -0,0 +1,71 @@
+Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
+off,off,off,off,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,off,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,off,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,off,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,on,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,on,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,on,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,on,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,off,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,off,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,off,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,off,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,on,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,on,off,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,on,on,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,on,on,on,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,off,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,on,on,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,any,off,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,on,any,off,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+off,off,off,any,on,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,off,off,off,on,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,off,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,off,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,off,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,on,off,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,on,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,on,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,on,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,off,off,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,off,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,off,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,off,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,on,off,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,on,off,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,on,on,off,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,on,on,on,on,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,off,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,off,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,off,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,off,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,off,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,on,off,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,on,off,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,on,on,off,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,on,on,on,on,on,any,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,any,off,any,off,74,64,34,64,74,64,34,64,62,52,28,52,62,52,28,52
+on,off,on,any,off,any,off,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
+on,off,off,any,on,any,off,74,64,34,64,70,64,34,64,62,52,28,52,62,52,28,52
diff --git a/bluetooth/bluetooth_power_limits_comet_JP.csv b/bluetooth/bluetooth_power_limits_comet_JP.csv
index 8131391..768e102 100644
--- a/bluetooth/bluetooth_power_limits_comet_JP.csv
+++ b/bluetooth/bluetooth_power_limits_comet_JP.csv
@@ -1,71 +1,71 @@
 Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
-off,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-off,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,off,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,off,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,off,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,off,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,on,off,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,on,off,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,on,on,off,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,on,on,on,on,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,off,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,off,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,off,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,off,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,off,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,on,off,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,on,off,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,on,on,off,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,on,on,on,on,on,any,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,on,any,off,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
-on,off,off,any,on,any,off,66,66,34,66,66,66,34,66,54,54,22,54,54,54,22,54
+off,off,off,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,off,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,on,on,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,on,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+off,off,off,any,on,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,off,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,off,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,off,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,off,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,on,off,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,on,off,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,on,on,off,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,on,on,on,on,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,off,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,off,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,off,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,off,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,off,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,on,off,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,on,off,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,on,on,off,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,on,on,on,on,on,any,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,on,any,off,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
+on,off,off,any,on,any,off,66,64,34,64,66,64,34,66,54,52,22,52,54,52,22,52
diff --git a/comet/overlay/frameworks/base/core/res/res/values/config_telephony.xml b/comet/overlay/frameworks/base/core/res/res/values/config_telephony.xml
new file mode 100644
index 0000000..297e211
--- /dev/null
+++ b/comet/overlay/frameworks/base/core/res/res/values/config_telephony.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Boolean indicating whether to enable persistent logging via DropBoxManager.
+         Used in persisting SOS/emergency related log messages. -->
+    <bool name="config_dropboxmanager_persistent_logging_enabled" translatable="false">true</bool>
+</resources>
diff --git a/comet/overlay/packages/services/Telephony/res/values/config.xml b/comet/overlay/packages/services/Telephony/res/values/config.xml
index 5f0d3a5..4fe41dd 100644
--- a/comet/overlay/packages/services/Telephony/res/values/config.xml
+++ b/comet/overlay/packages/services/Telephony/res/values/config.xml
@@ -17,6 +17,46 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
+    <!-- Dynamic routing of emergency calls: trying normal routing if it's available.
+         Otherwise, emergency routing. -->
+    <bool name="dynamic_routing_emergency_enabled">true</bool>
+
+    <!-- Array of countries that the dynamic routing is supported.
+         Values should be ISO3166 country codes in lowercase. -->
+    <string-array name="config_countries_dynamic_routing_emergency_enabled"
+            translatable="false">
+        <item>in</item>
+        <item>il</item>
+        <item>tw</item>
+        <item>sg</item>
+        <item>ch</item>
+        <item>sk</item>
+        <item>pl</item>
+        <item>si</item>
+        <item>ba</item>
+    </string-array>
+
+    <!-- Array of emergency numbers for dynamic routing.
+         Values are the tuples of Country ISO, MNC, and numbers. -->
+    <string-array name="config_dynamic_routing_emergency_numbers"
+      translatable="false">
+        <item>in,,101,102,103,108</item>
+        <item>il,,101,102</item>
+        <item>tw,,110,119</item>
+        <!-- b/343344830 -->
+        <item>sg,01,995</item>
+        <item>sg,02,995</item>
+        <item>sg,03,995</item>
+        <item>sg,10,995</item>
+        <item>ch,,1414</item>
+        <item>gp,,115,119,191,196,197,116000,116111,116117</item>
+        <item>sk,,159</item>
+        <item>pl,,984,985,986,987,989,991,992,993,994,995,996,997,998,999</item>
+        <item>re,,115,119,191,196,197,116000,116111,116117</item>
+        <item>si,,113</item>
+        <item>ba,,122,123,124</item>
+    </string-array>
+
     <!-- The component name(a flattened ComponentName string) for the telephony domain selection
          service. The device should fallback to the modem based domain selection architecture
          if this is not configured. -->
diff --git a/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_gc15s_cn.png b/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_gc15s_cn.png
index dff94cf..d9b21fe 100644
Binary files a/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_gc15s_cn.png and b/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_gc15s_cn.png differ
diff --git a/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_ggh2x_cn.png b/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_ggh2x_cn.png
new file mode 100644
index 0000000..d7c1c5c
Binary files /dev/null and b/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_ggh2x_cn.png differ
diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index 09d29dc..704f662 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -158,4 +158,6 @@ on boot && property:ro.boot.warranty.sku=UVZ
     setprop setupwizard.feature.provisioning_profile_mode true
 on boot && property:ro.boot.warranty.sku=UTM
     setprop setupwizard.feature.provisioning_profile_mode true
-
+# Enable bootstrap for DVT for convenient testing (b/343731008)
+on boot && property:ro.boot.hardware.revision=DVT1.0
+    setprop setupwizard.feature.provisioning_profile_mode true
diff --git a/device-comet.mk b/device-comet.mk
index f061323..0ae05f7 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -192,7 +192,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \
-    $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_CE.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CE.csv \
+    $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
     $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_comet_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
 
 # DCK properties based on target
@@ -224,6 +224,21 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.hfp.swb.supported=true
 
+# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=29 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
+else
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=16 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
+endif
+
 # Support LE & Classic concurrent encryption (b/330704060)
 PRODUCT_PRODUCT_PROPERTIES += \
     bluetooth.ble.allow_enc_with_bredr=true
@@ -327,6 +342,8 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Location
 PRODUCT_SOONG_NAMESPACES += device/google/comet/location
+# For GPS property
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
 
@@ -354,6 +371,10 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true
 
+# Enable camera exif model/make reporting
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.exif_reveal_make_model=true
+
 # Media Performance Class 14
 PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
 
@@ -438,6 +459,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.leaudio.allow_list=SM-R510
 
+# Telephony Satellite Feature
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.telephony.satellite.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.satellite.xml
+
 # Battery Mitigation Config
 ifeq (,$(TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH))
 TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH := device/google/comet/battery_mitigation
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 89d6ae9..4269e01 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>11-12</version>
+        <version>12</version>
         <interface>
             <name>IDisplay</name>
             <instance>secondary</instance>
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 9f901b2..3cfefad 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -7,9 +7,10 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
@@ -33,7 +34,7 @@ qzssUsedInUSPolicy=2
 navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-Chip_Configuration_FeatureCfg_MTPL = 0
+Chip_Configuration_FeatureCfg_MTPL = 1
 Chip_Configuration_FeatureCfg_SDL_BYASS = 1
 mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
@@ -52,7 +53,7 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x27
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 668609a..29084da 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -20,12 +20,14 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 # Enable/Disable 1PPS Time Sync policy
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 
 MaxNtnRefLocAgeSecs=600
 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
@@ -123,7 +125,7 @@ navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 # Disable MTPL
-Chip_Configuration_FeatureCfg_MTPL = 0
+Chip_Configuration_FeatureCfg_MTPL = 1
 # MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start)
 Chip_Configuration_FeatureCfg_SDL_BYASS = 1
 
@@ -180,7 +182,13 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x27
+
+# 0x0001: CHIP_CONFIG_MEMS_ACCEL_AVAILABLE
+# 0x0002: CHIP_CONFIG_MEMS_MAGN_AVAILABLE
+# 0x0004: CHIP_CONFIG_MEMS_GYRO_AVAILABLE
+# 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE
+# 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 002ac24..f8446e6 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -189,7 +189,8 @@
       "Values": [
         "1280",
         "1100",
-        "1280 1100 1055"
+        "1280 1100 1055",
+        "1100 1055 1055"
       ],
       "DefaultIndex": 1,
       "ResetOnInit": true
@@ -476,6 +477,16 @@
       "Type": "Property",
       "ResetOnInit": true
     },
+    {
+      "Name": "PowerHALLaunch",
+      "Path": "vendor.powerhal.is_launch",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "Type": "Property",
+      "ResetOnInit": true
+    },
     {
       "Name": "BigTjOffset",
       "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@@ -588,15 +599,6 @@
       ],
       "DefaultIndex": 0
     },
-    {
-      "Name": "PMU_FORCE_LIMIT",
-      "Path": "/proc/vendor_sched/pmu_force_limited",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "DefaultIndex": 0
-    },
     {
       "Name": "EM_Profile",
       "Path": "/sys/kernel/pixel_em/active_profile",
@@ -624,14 +626,12 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "76",
-        "70",
-        "40",
         "55",
-        "42",
-        "35",
+        "38",
+        "36",
+        "10",
         "30",
-        "20",
-        "0"
+        "28"
       ],
       "DefaultIndex": 0
     },
@@ -651,12 +651,11 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
       "Values": [
         "59",
-        "50",
-        "32",
-        "15",
         "30",
         "20",
-        "18"
+        "2",
+        "18",
+        "15"
       ],
       "DefaultIndex": 0
     },
@@ -675,9 +674,10 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold",
       "Values": [
         "62",
-        "50",
+        "0",
         "20",
-        "22"
+        "22",
+        "15"
       ],
       "DefaultIndex": 0
     },
@@ -840,6 +840,15 @@
         "67000"
       ],
       "ResetOnInit": true
+    },
+    {
+      "Name": "PA_KILL",
+      "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb",
+      "Values": [
+        "102400",
+        "0"
+      ],
+      "ResetOnInit": false
     }
   ],
   "Actions": [
@@ -1133,6 +1142,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "PowerHALLaunch",
+      "Duration": 5000,
+      "Value": "1"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1306,6 +1321,13 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "PA_KILL",
+      "EnableProperty": "vendor.powerhal.is_launch",
+      "Duration": 0,
+      "Value": "102400"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUSkipMask",
@@ -1478,19 +1500,19 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 3000,
-      "Value": "40"
+      "Value": "10"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 3000,
-      "Value": "15"
+      "Value": "2"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 3000,
-      "Value": "20"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1790,7 +1812,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "36"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1802,7 +1824,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "30"
+      "Value": "15"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1814,7 +1836,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "15"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1822,12 +1844,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "PMU_FORCE_LIMIT",
-      "Duration": 0,
-      "Value": "1"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "EM_Profile",
@@ -1838,7 +1854,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1055 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1934,7 +1950,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "55"
+      "Value": "38"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1946,7 +1962,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "32"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1966,12 +1982,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "PMU_FORCE_LIMIT",
-      "Duration": 0,
-      "Value": "1"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "EM_Profile",
@@ -1988,7 +1998,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1055 1055"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1996,12 +2006,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1548000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MemFreq",
@@ -2102,7 +2106,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "55"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2114,7 +2118,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "30"
+      "Value": "18"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2126,7 +2130,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "22"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2134,12 +2138,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "PMU_FORCE_LIMIT",
-      "Duration": 0,
-      "Value": "1"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "EM_Profile",
@@ -2446,12 +2444,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "PMU_FORCE_LIMIT",
-      "Duration": 0,
-      "Value": "1"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "PMU_LIT_LIMIT_FREQ",
@@ -2652,12 +2644,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "LOW_POWER",
-      "Node": "PMU_FORCE_LIMIT",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "LOW_POWER",
       "Node": "BigTjOffset",
@@ -2783,12 +2769,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
-      "Node": "PMU_FORCE_LIMIT",
-      "Duration": 0,
-      "Value": "0"
-    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "BigTjOffset",
@@ -3081,7 +3061,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "55"
+      "Value": "28"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3093,7 +3073,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "30"
+      "Value": "18"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3105,7 +3085,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "22"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3113,12 +3093,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_PROJECT11",
-      "Node": "PMU_FORCE_LIMIT",
-      "Duration": 0,
-      "Value": "1"
-    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "EM_Profile",
diff --git a/uwb/Android.bp b/uwb/Android.bp
index de2da1f..3b575b1 100644
--- a/uwb/Android.bp
+++ b/uwb/Android.bp
@@ -69,3 +69,9 @@ prebuilt_etc {
     defaults: ["conf_defaults"],
 }
 
+prebuilt_etc {
+    name: "capabilities.conf",
+    src: "capabilities.conf",
+    defaults: ["conf_defaults"],
+}
+
diff --git a/uwb/calibration.conf b/uwb/calibration.conf
index 15a5f2c..cbbd6f8 100644
--- a/uwb/calibration.conf
+++ b/uwb/calibration.conf
@@ -6,7 +6,7 @@ ant1.ch5.ant_delay=10:40:00:00
 ant1.ch9.ant_delay=10:40:00:00
 
 ant2.ch5.ant_delay=3D:40:00:00
-ant2.ch9.ant_delay=1F:40:00:00
+ant2.ch9.ant_delay=29:40:00:00
 
 ant3.ch5.ant_delay=10:40:00:00
 ant3.ch9.ant_delay=10:40:00:00
@@ -19,17 +19,17 @@ xtal_trim=0x30
 dual_rx_auto.accum_period=0x00
 
 # Increase TX power of 0.25 dB
-# ant0.ch5.pa_gain_offset=0x00
-# ant0.ch9.pa_gain_offset=0x00
+# ant0.ch5.pa_gain_offset=0x01
+# ant0.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-# ant1.ch5.pa_gain_offset=0x00
-# ant1.ch9.pa_gain_offset=0x00
+# ant1.ch5.pa_gain_offset=0xFF
+# ant1.ch9.pa_gain_offset=0xFF
 
 # Increase TX power of 0.25 dB
-# ant2.ch5.pa_gain_offset=0x00
-# ant2.ch9.pa_gain_offset=0x00
+# ant2.ch5.pa_gain_offset=0x01
+# ant2.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-# ant3.ch5.pa_gain_offset=0x00
-# ant3.ch9.pa_gain_offset=0x00
+# ant3.ch5.pa_gain_offset=0xFF
+# ant3.ch9.pa_gain_offset=0xFF
\ No newline at end of file
diff --git a/uwb/capabilities.conf b/uwb/capabilities.conf
new file mode 100644
index 0000000..792aff1
--- /dev/null
+++ b/uwb/capabilities.conf
@@ -0,0 +1,8 @@
+# Tag 0x13
+# Length 1
+# b0 : Azimuth AoA -90° to 90°
+# b1 : Azimuth AoA -180° to 180°
+# b2 : Elevation AoA
+# b3 : AoA FoM
+# b7-b4 : RFU
+AOA_SUPPORT=0x0B
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index 64e2b06..61340b5 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -21,5 +21,6 @@ PRODUCT_PACKAGES += \
     calibration-FCC.conf \
     calibration-JP.conf \
     calibration-TW.conf \
-    calibration-RESTRICTED.conf
+    calibration-RESTRICTED.conf \
+    capabilities.conf
 
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index 57d145d..8d0a3e6 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
 WIFI_FEATURE_HOSTAPD_11AX := true
 BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
 WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
+WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled
 
 PRODUCT_COPY_FILES += \
     device/google/comet/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \