diff --git a/bluetooth/bluetooth_power_limits_felix.csv b/bluetooth/bluetooth_power_limits_felix.csv
index a80d5ba..785733a 100644
--- a/bluetooth/bluetooth_power_limits_felix.csv
+++ b/bluetooth/bluetooth_power_limits_felix.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,60,60,30,66,66,30,54,54,18,54,54,18
 off,on,on,on,off,on,any,60,60,30,66,66,30,54,54,18,54,54,18
 off,on,on,on,on,off,any,60,60,30,66,66,30,54,54,18,54,54,18
 off,on,on,on,on,on,any,60,60,30,66,66,30,54,54,18,54,54,18
-off,off,any,any,any,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+off,off,off,any,off,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+off,off,on,any,off,any,off,56,56,30,66,66,30,54,54,18,54,54,18
+off,off,off,any,on,any,off,56,56,30,66,66,30,54,54,18,54,54,18
 on,off,off,off,off,off,on,66,66,30,66,66,30,54,54,18,54,54,18
 on,off,off,off,off,on,on,50,50,30,54,54,30,48,48,18,48,48,18
 on,off,off,off,on,off,on,50,50,30,54,54,30,48,48,18,48,48,18
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,28,28,30,48,48,30,28,28,18,48,48,18
 on,on,on,on,off,on,any,28,28,30,48,48,30,28,28,18,48,48,18
 on,on,on,on,on,off,any,28,28,30,48,48,30,28,28,18,48,48,18
 on,on,on,on,on,on,any,28,28,30,48,48,30,28,28,18,48,48,18
-on,off,any,any,any,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+on,off,off,any,off,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+on,off,on,any,off,any,off,50,50,30,54,54,30,48,48,18,48,48,18
+on,off,off,any,on,any,off,50,50,30,54,54,30,48,48,18,48,48,18
diff --git a/bluetooth/bluetooth_power_limits_felix_EU.csv b/bluetooth/bluetooth_power_limits_felix_EU.csv
index 862319c..af47d49 100644
--- a/bluetooth/bluetooth_power_limits_felix_EU.csv
+++ b/bluetooth/bluetooth_power_limits_felix_EU.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 off,on,on,on,off,on,any,68,66,30,74,66,30,64,54,18,64,54,18
 off,on,on,on,on,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 off,on,on,on,on,on,any,68,66,30,74,66,30,64,54,18,64,54,18
-off,off,any,any,any,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+off,off,off,any,off,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+off,off,on,any,off,any,off,68,66,30,74,66,30,64,54,18,64,54,18
+off,off,off,any,on,any,off,68,66,30,74,66,30,64,54,18,64,54,18
 on,off,off,off,off,off,on,76,66,30,76,66,30,64,54,18,64,54,18
 on,off,off,off,off,on,on,74,66,30,76,66,30,64,54,18,64,54,18
 on,off,off,off,on,off,on,74,66,30,76,66,30,64,54,18,64,54,18
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 on,on,on,on,off,on,any,68,66,30,74,66,30,64,54,18,64,54,18
 on,on,on,on,on,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 on,on,on,on,on,on,any,68,66,30,74,66,30,64,54,18,64,54,18
-on,off,any,any,any,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+on,off,off,any,off,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+on,off,on,any,off,any,off,74,66,30,76,66,30,64,54,18,64,54,18
+on,off,off,any,on,any,off,74,66,30,76,66,30,64,54,18,64,54,18
diff --git a/bluetooth/bluetooth_power_limits_felix_JP.csv b/bluetooth/bluetooth_power_limits_felix_JP.csv
index e09b044..28b52c5 100644
--- a/bluetooth/bluetooth_power_limits_felix_JP.csv
+++ b/bluetooth/bluetooth_power_limits_felix_JP.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 off,on,on,on,off,on,any,66,66,34,66,66,34,54,54,22,54,54,22
 off,on,on,on,on,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 off,on,on,on,on,on,any,66,66,34,66,66,34,54,54,22,54,54,22
-off,off,any,any,any,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+off,off,off,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+off,off,on,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+off,off,off,any,on,any,off,66,66,34,66,66,34,54,54,22,54,54,22
 on,off,off,off,off,off,on,66,66,34,66,66,34,54,54,22,54,54,22
 on,off,off,off,off,on,on,66,66,34,66,66,34,54,54,22,54,54,22
 on,off,off,off,on,off,on,66,66,34,66,66,34,54,54,22,54,54,22
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 on,on,on,on,off,on,any,66,66,34,66,66,34,54,54,22,54,54,22
 on,on,on,on,on,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 on,on,on,on,on,on,any,66,66,34,66,66,34,54,54,22,54,54,22
-on,off,any,any,any,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+on,off,off,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+on,off,on,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+on,off,off,any,on,any,off,66,66,34,66,66,34,54,54,22,54,54,22
diff --git a/bluetooth/bluetooth_power_limits_felix_US.csv b/bluetooth/bluetooth_power_limits_felix_US.csv
index 970f816..6d515a0 100644
--- a/bluetooth/bluetooth_power_limits_felix_US.csv
+++ b/bluetooth/bluetooth_power_limits_felix_US.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,60,60,60,78,66,78,58,54,58,66,54,66
 off,on,on,on,off,on,any,60,60,60,78,66,78,58,54,58,66,54,66
 off,on,on,on,on,off,any,60,60,60,78,66,78,58,54,58,66,54,66
 off,on,on,on,on,on,any,60,60,60,78,66,78,58,54,58,66,54,66
-off,off,any,any,any,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+off,off,off,any,off,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+off,off,on,any,off,any,off,56,56,56,66,66,66,56,54,56,66,54,66
+off,off,off,any,on,any,off,56,56,56,66,66,66,56,54,56,66,54,66
 on,off,off,off,off,off,on,78,66,78,78,66,78,66,54,66,66,54,66
 on,off,off,off,off,on,on,66,66,66,66,66,66,66,54,66,66,54,66
 on,off,off,off,on,off,on,66,66,66,66,66,66,66,54,66,66,54,66
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,28,28,28,48,48,48,28,28,28,48,48,48
 on,on,on,on,off,on,any,28,28,28,48,48,48,28,28,28,48,48,48
 on,on,on,on,on,off,any,28,28,28,48,48,48,28,28,28,48,48,48
 on,on,on,on,on,on,any,28,28,28,48,48,48,28,28,28,48,48,48
-on,off,any,any,any,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+on,off,off,any,off,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+on,off,on,any,off,any,off,50,50,50,54,54,54,48,48,48,48,48,48
+on,off,off,any,on,any,off,50,50,50,54,54,54,48,48,48,48,48,48
diff --git a/device-felix.mk b/device-felix.mk
index 760a9e2..78b4a7d 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=7
+    ro.vendor.build.svn=8
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\
diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml
index 7a77d32..3c45c6a 100644
--- a/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/rro_overlays/UwbOverlay/res/values/config.xml
@@ -17,4 +17,10 @@
  */
 -->
 <resources>
+    <!-- When true, the filter engine will alter UWB values to improve accuracy. -->
+    <bool name="enable_filters">true</bool>
+
+    <!-- Enables the AoA conversion primer. This is needed on hardware that does not convert AoA
+    to spherical coordinates, including hardware that does not support elevation.-->
+    <bool name="enable_primer_aoa">true</bool>
 </resources>