diff --git a/src/entrypoints/heli-entry.cpp b/src/entrypoints/heli-entry.cpp
index 0c5621e398940f3d62086ca0afaf113d2b7ea43e..17a02fef44a1c7533b789c97762920c58f27e87d 100644
--- a/src/entrypoints/heli-entry.cpp
+++ b/src/entrypoints/heli-entry.cpp
@@ -63,22 +63,9 @@ void pinCallback(unsigned int port, unsigned int num);
 
 void onButtonPressCallback(ButtonHandler_t::ButtonPress type);
 
-void initComponents()
-{
-    EventBroker::getInstance();
-
-    btnHandler = new ButtonHandler_t(1, &onButtonPressCallback);
-    scheduler  = new TaskScheduler();
-    fmm        = HeliFMM::getInstance();
-
-    sensorManager = new SensorManager(scheduler);
-    screen        = new ScreenManager(sensorManager);
-
-    pinObserver = new PinObserverWrapper();
-}
-
 void initPins()
 {
+
     {
         FastInterruptDisableLock d;
 
@@ -86,9 +73,10 @@ void initPins()
         CUTTER_ENA::mode(Mode::OUTPUT);
         CUTTER_IN::mode(Mode::ALTERNATE);
         CUTTER_IN::alternateFunction(2);
-        //CUTTER_CSENSE::mode(Mode::INPUT);
+        // CUTTER_CSENSE::mode(Mode::INPUT_ANALOG);
     }
-
+    
+    interfaces::buttons::user::mode(Mode::INPUT);
     red_led::mode(Mode::OUTPUT);
     green_led::mode(Mode::OUTPUT);
 
@@ -96,6 +84,20 @@ void initPins()
     D(red_led::high());
 }
 
+void initComponents()
+{
+    EventBroker::getInstance();
+
+    btnHandler = new ButtonHandler_t(1, &onButtonPressCallback);
+    scheduler  = new TaskScheduler();
+    fmm        = HeliFMM::getInstance();
+
+    sensorManager = new SensorManager(scheduler);
+    screen        = new ScreenManager(sensorManager);
+
+    pinObserver = new PinObserverWrapper();
+}
+
 int main()
 {
     initPins();
@@ -124,8 +126,7 @@ int main()
 
     pinObserver->start();
 
-    sEventBroker->postDelayed(Event{EV_START_SAMPLING}, TOPIC_COORDINATION,
-                              100);
+    sEventBroker->postDelayed({EV_START_SAMPLING}, TOPIC_COORDINATION, 100);
 
     while (true)
     {
@@ -138,7 +139,7 @@ int main()
                       MemoryProfiling::getCurrentFreeStack(),
                       MemoryProfiling::getAbsoluteFreeStack()});
 
-        Thread::sleep(250);
+        Thread::sleep(200);
     }
 }