diff --git a/code/daisy-looper/daisy-looper.ino b/code/daisy-looper/daisy-looper.ino
index e798e3a2f4ac2a8aed7f05a017211dda53181d2d..f0c5a6ea5289920242f1e38199896cb98cf8e54c 100644
--- a/code/daisy-looper/daisy-looper.ino
+++ b/code/daisy-looper/daisy-looper.ino
@@ -173,10 +173,9 @@ void setup() {
 
   // Initialize the Delay at a length of 1 second
   delayline.Init();
-  delayline.SetDelay(samplerate);
-
-  load.Init(sample_rate, blocksize);
+  delayline.SetDelay(sample_rate);
 
+  // Start serial communications
   Serial.begin(250000);
   Serial.println("Serial communication started");
 
diff --git a/code/daisy-looper/looper.h b/code/daisy-looper/looper.h
index a71079bceea8005804484778fa0147b08af46669..9a012ed0eed8595540d308f39215b36fa9caedcb 100644
--- a/code/daisy-looper/looper.h
+++ b/code/daisy-looper/looper.h
@@ -56,15 +56,15 @@ class Looper {
       rec_env_pos_inc = is_recording ? 1 : -1;
     }
 
-    void SetLoop(const float loop_start, const float loop_length) {
+    void SetLoop(const float loop_start_time, const float loop_length_time) {
       // Set the start of the next loop
-      pending_loop_start = static_cast<size_t>(loop_start * (buffer_length - 1));
+      pending_loop_start = static_cast<size_t>(loop_start_time * (buffer_length - 1));
 
       // If the current loop start is not set yet, set it too
       if (!is_loop_set) loop_start = pending_loop_start;
 
       // Set the length of the next loop
-      pendingloop_length = max(kMinLoopLength, static_cast<size_t>(loop_length * buffer_length));
+      pendingloop_length = max(kMinLoopLength, static_cast<size_t>(loop_length_time * buffer_length));
 
       // CHECK if this is truly good
       // loop_length = pendingloop_length;
diff --git a/menu.ods b/menu.ods
index 1b5d3f6346eea013ef11936ddfbd7c26749045e6..437288ca87db42653934698e3036e3be29161491 100644
Binary files a/menu.ods and b/menu.ods differ