diff --git a/BoardConfig.mk b/BoardConfig.mk
index 86bcf87..c1d3305 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -36,7 +36,7 @@
 TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 
 ### VENDOR SECURITY PATCH DATE
-VENDOR_SECURITY_PATCH := 2020-12-01
+VENDOR_SECURITY_PATCH := 2020-03-01
 
 ### VENDOR PROPS
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
diff --git a/device_manifest.xml b/device_manifest.xml
index 5669fa7..afdb644 100644
--- a/device_manifest.xml
+++ b/device_manifest.xml
@@ -1,5 +1,15 @@
 <manifest version="1.0" type="device" target-level="4">
     <hal format="hidl" override="true">
+        <name>android.hardware.gnss</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <version>1.1</version>
+        <interface>
+            <name>IGnss</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" override="true">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
         <fqname>@1.2::ISap/slot1</fqname>
@@ -13,7 +23,6 @@
             <name>IRadioConfig</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.1::IRadioConfig/default</fqname>
      </hal>
      <hal format="hidl">
         <name>vendor.samsung.hardware.radio</name>
@@ -23,7 +32,6 @@
             <name>ISehRadio</name>
             <instance>slot1</instance>
         </interface>
-        <fqname>@2.1::ISehRadio/slot1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.radio.bridge</name>
@@ -33,7 +41,6 @@
             <name>ISehBridge</name>
             <instance>slot1</instance>
         </interface>
-        <fqname>@2.0::ISehBridge/slot1</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.radio.channel</name>
@@ -44,7 +51,5 @@
             <instance>epdgd</instance>
             <instance>imsd</instance>
          </interface>
-        <fqname>@2.0::ISehChannel/epdgd</fqname>
-        <fqname>@2.0::ISehChannel/imsd</fqname>
      </hal>
 </manifest>
diff --git a/lineage_gta4xl.mk b/lineage_gta4xl.mk
index da8daed..1ff728e 100644
--- a/lineage_gta4xl.mk
+++ b/lineage_gta4xl.mk
@@ -27,17 +27,16 @@
 PRODUCT_MODEL := SM-P615
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_PDA_MODEL := P615
-PRODUCT_PDA_MODEL_VERSION := XXU4BTK2
+PRODUCT_PDA_MODEL_VERSION := XXU4CUBB
 PRODUCT_PDA_VERSION := $(PRODUCT_PDA_MODEL)$(PRODUCT_PDA_MODEL_VERSION)
 PRODUCT_SHIPPING_API_LEVEL := 29
 PRODUCT_GMS_CLIENTID_BASE := android-samsung
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME=gta4xlxx \
-    PRODUCT_DEVICE=gta4xl \
-    PRIVATE_BUILD_DESC="gta4xlxx-user 10 QP1A.190711.020 $(PRODUCT_PDA_VERSION) release-keys"
+    PRIVATE_BUILD_DESC="gta4xlxx-user 11 RP1A.200720.012 $(PRODUCT_PDA_VERSION) release-keys"
 
-BUILD_FINGERPRINT := samsung/gta4xlxx/gta4xl:10/QP1A.190711.020/$(PRODUCT_PDA_VERSION):user/release-keys
+BUILD_FINGERPRINT := samsung/gta4xlxx/gta4xl:11/RP1A.200720.012/$(PRODUCT_PDA_VERSION):user/release-keys
 
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.build.PDA=$(PRODUCT_PDA_VERSION)
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
deleted file mode 100644
index bb0f4c2..0000000
--- a/proprietary-files-vendor.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-# Proprietary files - from Samsung package version P615XXU4BTK2, unless pinned
-
-### AUDIO
-vendor/etc/floating_feature.xml
-vendor/etc/mixer_gains.xml
-vendor/lib/hw/audio.primary.exynos9611.so
-vendor/lib/libaudio-ril.so
-vendor/lib/soundfx/libsamsungSoundbooster_plus.so
-vendor/lib/soundfx/libswdap.so
-vendor/lib64/soundfx/libsamsungSoundbooster_plus.so
-vendor/lib64/soundfx/libswdap.so
-
-### AUDIO_FIRMWARE
-vendor/firmware/AP_AUDIO_SLSI.bin
-vendor/firmware/calliope_dram.bin
-vendor/firmware/calliope_sram.bin
-
-# CAMERA_DEPENDENCIES
-vendor/lib/libexynoscamera3.so
-vendor/lib64/libexynoscamera3.so
-
-### GPS/GNSS
-vendor/bin/hw/gpsd
-vendor/etc/gnss/gps.cfg
-vendor/etc/init/init.gps.rc
-vendor/lib64/hw/android.hardware.gnss@2.0-impl.so
-vendor/lib64/hw/vendor.samsung.hardware.gnss@2.0-impl.so
-vendor/lib64/libwrappergps.so
-
-### RIL
-vendor/bin/hw/rild
-vendor/bin/cbd
-vendor/bin/secril_config_svc
-vendor/etc/init/init.baseband.rc
-vendor/etc/plmn_delta.bin
-vendor/etc/plmn_delta_attaio.bin
-vendor/etc/plmn_delta_hktw.bin
-vendor/etc/plmn_delta_usagsm.bin
-vendor/etc/plmn_se13.bin
-vendor/lib/libaudio-ril.so
-vendor/lib/libmdf.so
-vendor/lib/libreference-ril.so
-vendor/lib/libril.so
-vendor/lib/librilutils.so
-vendor/lib/libsecure_storage.so
-vendor/lib/libsec-ril.so
-vendor/lib/vendor.samsung.hardware.radio.bridge@2.0.so
-vendor/lib/vendor.samsung.hardware.radio.channel@2.0.so
-vendor/lib/vendor.samsung.hardware.radio@2.0.so
-vendor/lib/vendor.samsung.hardware.radio@2.1.so
-vendor/lib64/libmdf.so
-vendor/lib64/libreference-ril.so
-vendor/lib64/libril.so
-vendor/lib64/librilutils.so
-vendor/lib64/libsecure_storage.so
-vendor/lib64/libsec-ril.so
-vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
-vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
-vendor/lib64/vendor.samsung.hardware.radio@2.0.so
-vendor/lib64/vendor.samsung.hardware.radio@2.1.so
-
-# TEEGRIS_FIRMWARE
-vendor/tee/00000000-0000-0000-0000-000000534b4d
-vendor/tee/00000000-0000-0000-0000-42494f535542
-vendor/tee/00000000-0000-0000-0000-4b45594d5354_vendor
-vendor/tee/00000000-0000-0000-0000-505256544545
-vendor/tee/00000000-0000-0000-0000-5345435f4652
-
-### WIDEVINE
-vendor/lib/libwvhidl.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 76df353..118aa46 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,24 +1,66 @@
-# Proprietary files - from Samsung package version P615XXU4BTK2, unless pinned
+# Proprietary files - from Samsung package version P615XXU4CUBB, unless pinned
 
-### GPS
-system/etc/init/init.gpscommon.rc
+### AUDIO
+vendor/etc/floating_feature.xml
+vendor/etc/mixer_gains.xml
+vendor/lib/hw/audio.primary.exynos9611.so
+
+### AUDIO_FIRMWARE
+vendor/firmware/CP_AUDIO_SLSI_SEA.bin
+vendor/firmware/calliope_dram.bin
+vendor/firmware/calliope_sram.bin
+vendor/firmware/cs35l41-dsp1-spk-prot.bin
+vendor/firmware/cs35l41-dsp1-spk-prot.wmfw
+vendor/firmware/cs35l41-dsp1-spk-prot-calib.bin
+
+# CAMERA_DEPENDENCIES
+vendor/lib/libexynoscamera3.so
+vendor/lib64/libexynoscamera3.so
+
+### GPS/GNSS
+vendor/bin/hw/gps.sh
+vendor/bin/hw/gpsd
+vendor/etc/gnss/gps.cfg
+vendor/etc/init/init.gps.rc
+vendor/lib64/hw/android.hardware.gnss@2.1-impl.so
+vendor/lib64/hw/vendor.samsung.hardware.gnss@2.0-impl.so
+vendor/lib64/libwrappergps.so
 
 ### RIL
-system/lib/libatparser.so
-system/lib/libfactoryutil.so
-system/lib/libfloatingfeature.so
-system/lib/libmdf.so
-system/lib/libomission_avoidance.so
-system/lib/libpacm_client.so
-system/lib/libsecnativefeature.so
-system/lib/libsecure_storage.so
-system/lib/libsecril-client.so
-system/lib64/libatparser.so
-system/lib64/libfactoryutil.so
-system/lib64/libfloatingfeature.so
-system/lib64/libmdf.so
-system/lib64/libomission_avoidance.so
-system/lib64/libpacm_client.so
-system/lib64/libsecnativefeature.so
-system/lib64/libsecure_storage.so
-system/lib64/libsecril-client.so
+vendor/bin/hw/rild
+vendor/bin/cbd
+vendor/bin/secril_config_svc
+vendor/etc/init/init.baseband.rc
+vendor/etc/plmn_delta.bin
+vendor/etc/plmn_delta_attaio.bin
+vendor/etc/plmn_delta_hktw.bin
+vendor/etc/plmn_delta_usagsm.bin
+vendor/etc/plmn_se13.bin
+vendor/lib/libengmode_client.so
+vendor/lib/libril.so
+vendor/lib/librilutils.so
+vendor/lib/libsec-ril.so
+vendor/lib/libsemnativecarrierfeature.so
+vendor/lib/vendor.samsung.hardware.radio.bridge@2.0.so
+vendor/lib/vendor.samsung.hardware.radio.channel@2.0.so
+vendor/lib/vendor.samsung.hardware.radio@2.0.so
+vendor/lib/vendor.samsung.hardware.radio@2.1.so
+vendor/lib64/libengmode_client.so
+vendor/lib64/libril.so
+vendor/lib64/librilutils.so
+vendor/lib64/libsec-ril.so
+vendor/lib64/libsemnativecarrierfeature.so
+vendor/lib64/libvkmanager_vendor.so
+vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
+vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
+vendor/lib64/vendor.samsung.hardware.radio@2.0.so
+vendor/lib64/vendor.samsung.hardware.radio@2.1.so
+
+# TEEGRIS_FIRMWARE
+vendor/tee/00000000-0000-0000-0000-00000000dead
+vendor/tee/00000000-0000-0000-0000-000000534b4d
+vendor/tee/00000000-0000-0000-0000-0053545354ab
+vendor/tee/00000000-0000-0000-0000-42494f535542
+vendor/tee/00000000-0000-0000-0000-4b45594d5354
+vendor/tee/00000000-0000-0000-0000-505256544545
+vendor/tee/00000000-0000-0000-0000-5345435f4652