diff --git a/Android.mk b/Android.mk
index f44cf83..500455f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,26 +6,26 @@
 
 ifeq ($(TARGET_DEVICE),beyond1lte)
 
-$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G973F,126476b563c7a54a10edd724a6e0b5cfbc9e0532)
-$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G973N,3762c3aa59a8a129e6628f0e4dee43cb4f6e25eb)
-$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G973F,6169ec6eac7ea874ca4a0d4953d7b76ed3e53a7b)
-$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G973N,597d40940b8fd35e68e2c42568cdc2b65abf018a)
-$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G973F,92924d561c657d64d4b8004b6f6186eb9f39ecac)
-$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G973N,fc260e8d95ce0fceec6a400298fe782015c714a8)
+$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G973F,f9c7f55ae776e331df7e9cfddf41137dd98dc757)
+$(call add-radio-file-sha1-checked,radio/cm.bin_SM-G973N,98c7df501900895823a34ccdfc5240865814e0e4)
+$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G973F,867d39fb839488472e24a151985b0dd4cb3662af)
+$(call add-radio-file-sha1-checked,radio/dqmdbg.img_SM-G973N,2a3b4f162457c8eb57de62b2a6afbcd60ee6ef28)
+$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G973F,1ec505909291ff464f63f38d520b76e427d4908a)
+$(call add-radio-file-sha1-checked,radio/keystorage.bin_SM-G973N,19942b7434a87f38157b23d9e5686fd528eeecbd)
 $(call add-radio-file-sha1-checked,radio/models,1ef6255117afcaec2ba8beb1a9e613d825abcf82)
-$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G973F,eed1f1c002f2db36c820e03476f29a3655039c66)
-$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G973N,1552eec6dfa02cd3292f67c051ebd8206011a928)
-$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G973F,1931bf41b1749892abd91dc93fb94581df87e954)
-$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G973N,c345b38e63b3298bddc039d79987fcced8343182)
-$(call add-radio-file-sha1-checked,radio/param.bin_SM-G973F,9781693e991c4072a933ab3da2462fba28b7c577)
-$(call add-radio-file-sha1-checked,radio/param.bin_SM-G973N,fbf8216294af7d982894a66a67cbb4443918a948)
-$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G973F,ae553ae3e9eb8f6e852b653e26c3c973548a3418)
-$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G973N,b38f066e660349f811a945add4d50d027aaa8b80)
-$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G973F,d89bc2bf4d00952d94c6210ed1c755deda4fea14)
-$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G973N,68d2e9edada459a5f3f60c75c6eab10ab1aca321)
-$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G973F,b9e442728885aa115bcc903f4ca7bbfb8ae867ea)
-$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G973N,d73f8be51f072cd74f5821f6b058637380ccf807)
-$(call add-radio-file-sha1-checked,radio/version_SM-G973F,712415d711e12e35b021dd777306f3d99f2aae8d)
-$(call add-radio-file-sha1-checked,radio/version_SM-G973N,9b653742a7bcfcdcbef3f20644bb01923cda1776)
+$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G973F,9f56964ec570d709911403fd414b4efe028792b9)
+$(call add-radio-file-sha1-checked,radio/modem.bin_SM-G973N,4ca61d5034ecca16f05020a2ce7c20c1d11e3794)
+$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G973F,4feba681a7d9efe99ea0cd465963f7d96dd17611)
+$(call add-radio-file-sha1-checked,radio/modem_debug.bin_SM-G973N,a94fd4eb38007bfcbe4ef88b941c1d5c2940bf8c)
+$(call add-radio-file-sha1-checked,radio/param.bin_SM-G973F,cc375acf6889812b47e8762b59ca75d27b27ddc1)
+$(call add-radio-file-sha1-checked,radio/param.bin_SM-G973N,9721305e65c13d1686c51e21b765888ba424f0c0)
+$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G973F,0224b1568d3ec348bad2918e0bf81214aab7f5c5)
+$(call add-radio-file-sha1-checked,radio/sboot.bin_SM-G973N,d06d7694c96ad8cec92dbd2594f8ee43ef6f6ae0)
+$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G973F,cc28604dfddc06cada9bdb60d96aaf248c64ae7c)
+$(call add-radio-file-sha1-checked,radio/uh.bin_SM-G973N,5427dba6bd330bf2812675bf7c46fd2f8e9972cc)
+$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G973F,218c771da641276525130bf9315c620af753aad8)
+$(call add-radio-file-sha1-checked,radio/up_param.bin_SM-G973N,aa8573639dbd7886b7ff4ae18bd92e9815424320)
+$(call add-radio-file-sha1-checked,radio/version_SM-G973F,de6872e8d6a90daf76705d100655233273ca1032)
+$(call add-radio-file-sha1-checked,radio/version_SM-G973N,e725ea0d3f4f826612cd563f2b4eaed9e19973a6)
 
 endif
diff --git a/proprietary/vendor/firmware/fimc_is_rta.bin b/proprietary/vendor/firmware/fimc_is_rta.bin
index 969eb31..39b4c56 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 6afdd0c..b7ab59c 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 1d535b1..df2cad3 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 d89b511..7feb3b9 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 f704c57..5e5a3ac 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 6747cb8..d73e9bb 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/driver/00000000-0000-0000-0000-53626f786476 b/proprietary/vendor/tee/driver/00000000-0000-0000-0000-53626f786476
index 52c6a56..76e169e 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-G973F b/radio/cm.bin_SM-G973F
index e04ba98..3b24317 100644
--- a/radio/cm.bin_SM-G973F
+++ b/radio/cm.bin_SM-G973F
Binary files differ
diff --git a/radio/cm.bin_SM-G973N b/radio/cm.bin_SM-G973N
index 9f88693..bc7a754 100644
--- a/radio/cm.bin_SM-G973N
+++ b/radio/cm.bin_SM-G973N
Binary files differ
diff --git a/radio/dqmdbg.img_SM-G973F b/radio/dqmdbg.img_SM-G973F
index d005add..bfebe57 100644
--- a/radio/dqmdbg.img_SM-G973F
+++ b/radio/dqmdbg.img_SM-G973F
Binary files differ
diff --git a/radio/dqmdbg.img_SM-G973N b/radio/dqmdbg.img_SM-G973N
index dfcbeb3..f7bd0cc 100644
--- a/radio/dqmdbg.img_SM-G973N
+++ b/radio/dqmdbg.img_SM-G973N
Binary files differ
diff --git a/radio/keystorage.bin_SM-G973F b/radio/keystorage.bin_SM-G973F
index 5b1b958..cfb850b 100644
--- a/radio/keystorage.bin_SM-G973F
+++ b/radio/keystorage.bin_SM-G973F
Binary files differ
diff --git a/radio/keystorage.bin_SM-G973N b/radio/keystorage.bin_SM-G973N
index af1da47..7280fd7 100644
--- a/radio/keystorage.bin_SM-G973N
+++ b/radio/keystorage.bin_SM-G973N
Binary files differ
diff --git a/radio/modem.bin_SM-G973F b/radio/modem.bin_SM-G973F
index 88b6932..719cee0 100644
--- a/radio/modem.bin_SM-G973F
+++ b/radio/modem.bin_SM-G973F
Binary files differ
diff --git a/radio/modem.bin_SM-G973N b/radio/modem.bin_SM-G973N
index 961533c..1298bc3 100644
--- a/radio/modem.bin_SM-G973N
+++ b/radio/modem.bin_SM-G973N
Binary files differ
diff --git a/radio/modem_debug.bin_SM-G973F b/radio/modem_debug.bin_SM-G973F
index bc74aea..091223f 100644
--- a/radio/modem_debug.bin_SM-G973F
+++ b/radio/modem_debug.bin_SM-G973F
Binary files differ
diff --git a/radio/modem_debug.bin_SM-G973N b/radio/modem_debug.bin_SM-G973N
index 2aa8bef..1a28e9d 100644
--- a/radio/modem_debug.bin_SM-G973N
+++ b/radio/modem_debug.bin_SM-G973N
Binary files differ
diff --git a/radio/param.bin_SM-G973F b/radio/param.bin_SM-G973F
index 0a3caab..4215678 100644
--- a/radio/param.bin_SM-G973F
+++ b/radio/param.bin_SM-G973F
Binary files differ
diff --git a/radio/param.bin_SM-G973N b/radio/param.bin_SM-G973N
index 54a30a0..2ad08bf 100644
--- a/radio/param.bin_SM-G973N
+++ b/radio/param.bin_SM-G973N
Binary files differ
diff --git a/radio/sboot.bin_SM-G973F b/radio/sboot.bin_SM-G973F
index f4b45df..8d80ff4 100644
--- a/radio/sboot.bin_SM-G973F
+++ b/radio/sboot.bin_SM-G973F
Binary files differ
diff --git a/radio/sboot.bin_SM-G973N b/radio/sboot.bin_SM-G973N
index 37f5978..ec11711 100644
--- a/radio/sboot.bin_SM-G973N
+++ b/radio/sboot.bin_SM-G973N
Binary files differ
diff --git a/radio/uh.bin_SM-G973F b/radio/uh.bin_SM-G973F
index 01423ac..892ca57 100644
--- a/radio/uh.bin_SM-G973F
+++ b/radio/uh.bin_SM-G973F
Binary files differ
diff --git a/radio/uh.bin_SM-G973N b/radio/uh.bin_SM-G973N
index 9074462..0d31abe 100644
--- a/radio/uh.bin_SM-G973N
+++ b/radio/uh.bin_SM-G973N
Binary files differ
diff --git a/radio/up_param.bin_SM-G973F b/radio/up_param.bin_SM-G973F
index 6d620fc..6288b83 100644
--- a/radio/up_param.bin_SM-G973F
+++ b/radio/up_param.bin_SM-G973F
Binary files differ
diff --git a/radio/up_param.bin_SM-G973N b/radio/up_param.bin_SM-G973N
index 51192ac..38f2c7e 100644
--- a/radio/up_param.bin_SM-G973N
+++ b/radio/up_param.bin_SM-G973N
Binary files differ
diff --git a/radio/version_SM-G973F b/radio/version_SM-G973F
index 5718443..e0ebe9c 100644
--- a/radio/version_SM-G973F
+++ b/radio/version_SM-G973F
@@ -1 +1 @@
-G973FXXSGHWC1
+G973FXXSGHWC2
diff --git a/radio/version_SM-G973N b/radio/version_SM-G973N
index 0303316..2189da6 100644
--- a/radio/version_SM-G973N
+++ b/radio/version_SM-G973N
@@ -1 +1 @@
-G973NKSU7HWA1
+G973NKSU7HWD3