diff --git a/firmware/application/ui_soundboard.cpp b/firmware/application/ui_soundboard.cpp
index 705da133b..a0d32c579 100644
--- a/firmware/application/ui_soundboard.cpp
+++ b/firmware/application/ui_soundboard.cpp
@@ -27,15 +27,16 @@
 #include "ch.h"
 #include "file.hpp"
 
+#include "lfsr_random.hpp"
 #include "ui_alphanum.hpp"
-#include "ff.h"
-#include "hackrf_gpio.hpp"
+//#include "ff.h"
+//#include "hackrf_gpio.hpp"
 #include "portapack.hpp"
-#include "radio.hpp"
-#include "event_m0.hpp"
+//#include "radio.hpp"
+//#include "event_m0.hpp"
 #include "string_format.hpp"
 
-#include "hackrf_hal.hpp"
+//#include "hackrf_hal.hpp"
 #include "portapack_shared_memory.hpp"
 
 #include <cstring>
@@ -45,20 +46,12 @@ using namespace portapack;
 
 namespace ui {
 
-uint16_t SoundBoardView::shitty_rand() {
-	uint8_t bit;
-	
-	bit  = ((lfsr >> 0) ^ (lfsr >> 2) ^ (lfsr >> 3) ^ (lfsr >> 5) ) & 1;
-	
-	return lfsr = (lfsr >> 1) | (bit << 15);
-}
-
 void SoundBoardView::do_random() {
 	uint16_t id;
 	
-	chThdSleepMilliseconds(300);	// 100ms
+	chThdSleepMilliseconds(300);	// 300ms
 	
-	id = shitty_rand() % max_sound;
+	id = lfsr_iterate(lfsr_v) % max_sound;
 
 	play_sound(id);
 	
diff --git a/firmware/application/ui_soundboard.hpp b/firmware/application/ui_soundboard.hpp
index bb8054042..c4934c11f 100644
--- a/firmware/application/ui_soundboard.hpp
+++ b/firmware/application/ui_soundboard.hpp
@@ -68,7 +68,7 @@ private:
 	
 	File file;
 	
-	uint16_t lfsr = 0x1337u;
+	uint16_t lfsr_v = 0x1337;
 	
 	sound sounds[100];
 	uint8_t max_sound;
@@ -103,7 +103,6 @@ private:
 	void on_tuning_frequency_changed(rf::Frequency f);
 	
 	void do_random();
-	uint16_t shitty_rand();
 	void show_infos(uint16_t id);
 	void change_page(Button& button, const KeyEvent key);
 	void refresh_buttons(uint16_t id);
diff --git a/firmware/baseband/terminator.img b/firmware/baseband/terminator.img
deleted file mode 100644
index 1b1cb4d44..000000000
Binary files a/firmware/baseband/terminator.img and /dev/null differ
diff --git a/firmware/portapack-h1-havoc.bin b/firmware/portapack-h1-havoc.bin
index 811bd6114..adef30c29 100644
Binary files a/firmware/portapack-h1-havoc.bin and b/firmware/portapack-h1-havoc.bin differ