diff --git a/Android.mk b/Android.mk
index 6bf8f49..d85f323 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,30 +6,30 @@
 
 ifeq ($(TARGET_DEVICE),d2x)
 
-$(call add-radio-file-sha1-checked,radio/cm.bin_SM-N976B,b72d96cfd138378fa8e39699a2e0b55d42fe5d12)
-$(call add-radio-file-sha1-checked,radio/cm.bin_SM-N976N,b1daf3c653d44edf2770db88068a3323a5892963)
-$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-N976B,52b98f3fd1146a38b526e5525de731af90282367)
-$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-N976N,09d28e23d83bd646ff160b9efc132605d65f1ec6)
-$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-N976B,e201aee79b9a014131500b13fe82fc4b8ab46a5f)
-$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-N976N,d6e6a0f3852fad3eae4638faa9e4a34d409c9542)
+$(call add-radio-file-sha1-checked,radio/cm.bin_SM-N976B,98b8824c149838c9fb2490a7811f0f34ee28dd87)
+$(call add-radio-file-sha1-checked,radio/cm.bin_SM-N976N,a6f47c31b01328191f1c24824029434abb2876b1)
+$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-N976B,31343f06c117d1b72261b1a7ac459d5c69db5716)
+$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-N976N,d44821c2e15dea283076cb4e9759e3905c6fe4f0)
+$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-N976B,ae0fec716563d2c1bbba8738a2abac0ebf4b7552)
+$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-N976N,7476e6d58c09957d560c7f2e0201d17e497997a1)
 $(call add-radio-file-sha1-checked,radio/models,3355889615e4a8ae46a6218e5c266655cc079cd9)
-$(call add-radio-file-sha1-checked,radio/modem.bin_SM-N976B,4983d67b854b2b9dc0dcded9d4cff8f3659a4f2c)
-$(call add-radio-file-sha1-checked,radio/modem.bin_SM-N976N,81a40685470378df5b94a1a31a56a41200977db1)
-$(call add-radio-file-sha1-checked,radio/modem_5g.bin_SM-N976B,ce042e138b05b326d0e8303f9bdde08809bcad8c)
-$(call add-radio-file-sha1-checked,radio/modem_5g.bin_SM-N976N,d993aaed638c9d981d99f31fd890de36fd7e660c)
-$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-N976B,161b9e8fc88ffdb5b786e5daf2d86aa30f2f5d58)
-$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-N976N,229a8d6bb71bee8f1e33f46d125767c2135303b4)
-$(call add-radio-file-sha1-checked,radio/modem_debug_5g.bin_SM-N976B,c641edbbe7827f3a3b87fdebe00d36614f59f53a)
-$(call add-radio-file-sha1-checked,radio/modem_debug_5g.bin_SM-N976N,0c5cb42c1668adc31122fd8d62f93143969130bb)
-$(call add-radio-file-sha1-checked,radio/param.bin_SM-N976B,5dd7aee1a9814277f723e5a63cb8ca5d0c514ba6)
-$(call add-radio-file-sha1-checked,radio/param.bin_SM-N976N,945181127bacbe37de94503c65b9ef37f00cb6fa)
-$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-N976B,1250e810f141e072376441b6aebc74e70c434129)
-$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-N976N,91fdce37075c25f9ee6359b63308f21a2695df19)
-$(call add-radio-file-sha1-checked,radio/uh.bin_SM-N976B,4af254aed5585f8a8783ec98295720d380521bad)
-$(call add-radio-file-sha1-checked,radio/uh.bin_SM-N976N,b382357b7b52b56b5b84e3abd81b26d6de25a544)
-$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-N976B,65d41d04666b61a052b0acfb0f4bbe8d744d26e8)
-$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-N976N,8f139b9d6d1521263dc6e867f6bdedb37fb2438b)
-$(call add-radio-file-sha1-checked,radio/version_SM-N976B,0b6e72417c3565b76a74dfd68602ebfe482b3640)
-$(call add-radio-file-sha1-checked,radio/version_SM-N976N,ea4ef8cb88464d98f5b619c3a510b3d41bce916b)
+$(call add-radio-file-sha1-checked,radio/modem.bin_SM-N976B,404011bd63c3b5d2a6ec9bffe15bfdea2e7e36cd)
+$(call add-radio-file-sha1-checked,radio/modem.bin_SM-N976N,4e97917cf22ae6ba980717abbfad4fe6d8255bef)
+$(call add-radio-file-sha1-checked,radio/modem_5g.bin_SM-N976B,c15804b5d8c52c5d4e5e6e54f216793072e35b38)
+$(call add-radio-file-sha1-checked,radio/modem_5g.bin_SM-N976N,31ea54305b178dbc2179496d50558e95dafc073c)
+$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-N976B,a61ae264f1289a880b623cdb0575f6c386cfcd58)
+$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-N976N,e7572d7c0326514dd9275400a1b8c2033da3bc7f)
+$(call add-radio-file-sha1-checked,radio/modem_debug_5g.bin_SM-N976B,60d4b43a1e791ed512d0bc0ff9eaf049c28ffb31)
+$(call add-radio-file-sha1-checked,radio/modem_debug_5g.bin_SM-N976N,4a24b00f255aaf201ab5b8732cf284bb8dd5e73c)
+$(call add-radio-file-sha1-checked,radio/param.bin_SM-N976B,9e98ab97cb1528796416a32168b903ebe3b46756)
+$(call add-radio-file-sha1-checked,radio/param.bin_SM-N976N,98ac2ea8eb3cf09a1ba0eda7ae7a41caadf6f6dc)
+$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-N976B,4c365e1d1b1bcf0fbcfff12138cd6e2f433b19e7)
+$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-N976N,037b9d82177e0a42714eece4ebfb3326def247a9)
+$(call add-radio-file-sha1-checked,radio/uh.bin_SM-N976B,5d1b8b1a859023181957eb8572870f0914069880)
+$(call add-radio-file-sha1-checked,radio/uh.bin_SM-N976N,96e67a2fde9c315a7c690b9a3717cb9b52b03de3)
+$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-N976B,94dafb982f44725c8cb5431a35df3f513ccdd287)
+$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-N976N,55bd744c70c387ef4cf763612b9e6c3cd6ad9b33)
+$(call add-radio-file-sha1-checked,radio/version_SM-N976B,b5c0b6cbf96934f87af8437e550f0dbea1041828)
+$(call add-radio-file-sha1-checked,radio/version_SM-N976N,df5b6f74665415b5ff9c437f84c1759a25fc3280)
 
 endif
diff --git a/proprietary/vendor/firmware/fimc_is_rta.bin b/proprietary/vendor/firmware/fimc_is_rta.bin
index 8c69aa9..74e4941 100644
--- a/proprietary/vendor/firmware/fimc_is_rta.bin
+++ b/proprietary/vendor/firmware/fimc_is_rta.bin
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d b/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d
index 5e8d3d6..9525be8 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-000000534b4d
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab b/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab
index 64cfb0d..81a63de 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-0053545354ab
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502 b/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502
index a53c105..5b10c66 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-46494e474502
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354 b/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354
index a6e0811..afffc10 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-4b45594d5354
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545 b/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545
index 8666eb9..02d0f56 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-505256544545
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052 b/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052
index b14bcbf..7d74f46 100644
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052
+++ b/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052
Binary files differ
diff --git a/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476 b/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
index 7f2ff28..240f3ef 100644
--- a/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
+++ b/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
Binary files differ
diff --git a/radio/cm.bin_SM-N976B b/radio/cm.bin_SM-N976B
index 3e14b2a..06db674 100644
--- a/radio/cm.bin_SM-N976B
+++ b/radio/cm.bin_SM-N976B
Binary files differ
diff --git a/radio/cm.bin_SM-N976N b/radio/cm.bin_SM-N976N
index 30810cd..f4856c0 100644
--- a/radio/cm.bin_SM-N976N
+++ b/radio/cm.bin_SM-N976N
Binary files differ
diff --git a/radio/dqmdbg.img_SM-N976B b/radio/dqmdbg.img_SM-N976B
index 4d12b37..a6e2002 100644
--- a/radio/dqmdbg.img_SM-N976B
+++ b/radio/dqmdbg.img_SM-N976B
Binary files differ
diff --git a/radio/dqmdbg.img_SM-N976N b/radio/dqmdbg.img_SM-N976N
index 1d32560..b436eb7 100644
--- a/radio/dqmdbg.img_SM-N976N
+++ b/radio/dqmdbg.img_SM-N976N
Binary files differ
diff --git a/radio/keystorage.bin_SM-N976B b/radio/keystorage.bin_SM-N976B
index 34654e3..e5ee0bd 100644
--- a/radio/keystorage.bin_SM-N976B
+++ b/radio/keystorage.bin_SM-N976B
Binary files differ
diff --git a/radio/keystorage.bin_SM-N976N b/radio/keystorage.bin_SM-N976N
index d728e14..93a3e20 100644
--- a/radio/keystorage.bin_SM-N976N
+++ b/radio/keystorage.bin_SM-N976N
Binary files differ
diff --git a/radio/modem.bin_SM-N976B b/radio/modem.bin_SM-N976B
index b6ccf40..aabbc5c 100644
--- a/radio/modem.bin_SM-N976B
+++ b/radio/modem.bin_SM-N976B
Binary files differ
diff --git a/radio/modem.bin_SM-N976N b/radio/modem.bin_SM-N976N
index 7fd06c7..66f4d11 100644
--- a/radio/modem.bin_SM-N976N
+++ b/radio/modem.bin_SM-N976N
Binary files differ
diff --git a/radio/modem_5g.bin_SM-N976B b/radio/modem_5g.bin_SM-N976B
index 3a74848..ab4e018 100644
--- a/radio/modem_5g.bin_SM-N976B
+++ b/radio/modem_5g.bin_SM-N976B
Binary files differ
diff --git a/radio/modem_5g.bin_SM-N976N b/radio/modem_5g.bin_SM-N976N
index 75540de..e67db2d 100644
--- a/radio/modem_5g.bin_SM-N976N
+++ b/radio/modem_5g.bin_SM-N976N
Binary files differ
diff --git a/radio/modem_debug.bin_SM-N976B b/radio/modem_debug.bin_SM-N976B
index 3785bea..708b5bc 100644
--- a/radio/modem_debug.bin_SM-N976B
+++ b/radio/modem_debug.bin_SM-N976B
Binary files differ
diff --git a/radio/modem_debug.bin_SM-N976N b/radio/modem_debug.bin_SM-N976N
index c6cb4a8..b9598fc 100644
--- a/radio/modem_debug.bin_SM-N976N
+++ b/radio/modem_debug.bin_SM-N976N
Binary files differ
diff --git a/radio/modem_debug_5g.bin_SM-N976B b/radio/modem_debug_5g.bin_SM-N976B
index 05a58aa..de4e700 100644
--- a/radio/modem_debug_5g.bin_SM-N976B
+++ b/radio/modem_debug_5g.bin_SM-N976B
Binary files differ
diff --git a/radio/modem_debug_5g.bin_SM-N976N b/radio/modem_debug_5g.bin_SM-N976N
index 7dd3b5e..50b3157 100644
--- a/radio/modem_debug_5g.bin_SM-N976N
+++ b/radio/modem_debug_5g.bin_SM-N976N
Binary files differ
diff --git a/radio/param.bin_SM-N976B b/radio/param.bin_SM-N976B
index 4c80fd1..080dd74 100644
--- a/radio/param.bin_SM-N976B
+++ b/radio/param.bin_SM-N976B
Binary files differ
diff --git a/radio/param.bin_SM-N976N b/radio/param.bin_SM-N976N
index 0f235db..be69957 100644
--- a/radio/param.bin_SM-N976N
+++ b/radio/param.bin_SM-N976N
Binary files differ
diff --git a/radio/sboot.bin_SM-N976B b/radio/sboot.bin_SM-N976B
index 174f1ec..f1203ca 100644
--- a/radio/sboot.bin_SM-N976B
+++ b/radio/sboot.bin_SM-N976B
Binary files differ
diff --git a/radio/sboot.bin_SM-N976N b/radio/sboot.bin_SM-N976N
index 1a173e2..c6c5fde 100644
--- a/radio/sboot.bin_SM-N976N
+++ b/radio/sboot.bin_SM-N976N
Binary files differ
diff --git a/radio/uh.bin_SM-N976B b/radio/uh.bin_SM-N976B
index faa1340..b6b9f95 100644
--- a/radio/uh.bin_SM-N976B
+++ b/radio/uh.bin_SM-N976B
Binary files differ
diff --git a/radio/uh.bin_SM-N976N b/radio/uh.bin_SM-N976N
index 486bab8..7d7e447 100644
--- a/radio/uh.bin_SM-N976N
+++ b/radio/uh.bin_SM-N976N
Binary files differ
diff --git a/radio/up_param.bin_SM-N976B b/radio/up_param.bin_SM-N976B
index c625584..5feecba 100644
--- a/radio/up_param.bin_SM-N976B
+++ b/radio/up_param.bin_SM-N976B
Binary files differ
diff --git a/radio/up_param.bin_SM-N976N b/radio/up_param.bin_SM-N976N
index a82232b..129dcf4 100644
--- a/radio/up_param.bin_SM-N976N
+++ b/radio/up_param.bin_SM-N976N
Binary files differ
diff --git a/radio/version_SM-N976B b/radio/version_SM-N976B
index 015ede8..c9dcd3a 100644
--- a/radio/version_SM-N976B
+++ b/radio/version_SM-N976B
@@ -1 +1 @@
-N976BXXS8HWA1
+N976BXXS9HWHB
diff --git a/radio/version_SM-N976N b/radio/version_SM-N976N
index 10702de..9d683cf 100644
--- a/radio/version_SM-N976N
+++ b/radio/version_SM-N976N
@@ -1 +1 @@
-N976NKSU2HWB1
+N976NKSU2HWH5