diff --git a/midi2cv/bootloader/bootloader.cc b/midi2cv/bootloader/bootloader.cc
index 233ff91..24091a4 100644
--- a/midi2cv/bootloader/bootloader.cc
+++ b/midi2cv/bootloader/bootloader.cc
@@ -1,11 +1,18 @@
 #include <stm32f37x_conf.h>
 
 #include "stmlib/system/bootloader_utils.h"
+#include "stmlib/system/system_clock.h"
 #include "midi2cv/drivers/eco_display.h"
 #include <U8x8lib.h>
 
 using namespace stmlib;
 
+extern "C" {
+  void SysTick_Handler() {
+    system_clock.Tick();
+  }
+}
+
 const uint32_t kStartAddress = 0x08008000;
 
 EcoDisplay display;
@@ -14,12 +21,18 @@ int main(void)
 {
   SystemInit();
 
+  SysTick_Config(F_CPU / 1000);
+
+  system_clock.Init();
+
   display.Init();
 
   display.u8x8()->setFont(u8x8_font_amstrad_cpc_extended_r);
   display.u8x8()->drawString(0, 0, "Moin");
-  for (int i = 0; i < 100000000; i++)
-    ;
+  system_clock.Delay(500);
+  display.u8x8()->drawString(0, 10, "i bims");
+  system_clock.Delay(1000);
+
   Uninitialize();
   JumpTo(kStartAddress);
 }
diff --git a/midi2cv/settings.h b/midi2cv/settings.h
index 006c135..fb20b4b 100644
--- a/midi2cv/settings.h
+++ b/midi2cv/settings.h
@@ -65,7 +65,7 @@ class Settings {
   State state_;
 
   stmlib::ChunkStorage<
-      0x08006000,
+      0x08004000,
       0x08008000,
       PersistentData,
       State>