diff --git a/BoxTimer.cpp b/BoxTimer.cpp
index f2f04bf..40448f4 100644
--- a/BoxTimer.cpp
+++ b/BoxTimer.cpp
@@ -1,7 +1,8 @@
 #include "BoxTimer.h"
 
 void BoxTimer::setTimer(unsigned long milliseconds) { 
-    _endMillis = millis() + milliseconds;
+    _currentMillis = millis();
+    _endMillis = _currentMillis + milliseconds;
     _isRunning = true;
     _hasChanged = true;
 }
diff --git a/Hackiebox.cpp b/Hackiebox.cpp
index d5c51cf..cca5bec 100755
--- a/Hackiebox.cpp
+++ b/Hackiebox.cpp
@@ -113,9 +113,7 @@ void Hackiebox::setup() {
 }
 
 void Hackiebox::delayTask(uint16_t millis) {
-    if (millis == 0)
-        return;
-    if (!inDelayTask) {
+     if (!inDelayTask) {
         inDelayTask = true;
         BoxTimer timer;
         timer.setTimer(millis);
@@ -133,7 +131,11 @@ void Hackiebox::delayTask(uint16_t millis) {
     }
 }
 void Hackiebox::delayTaskWork(uint16_t millis) {
-    boxDAC.generateZeroAudio(millis);
+    //delay(millis);
+    boxDAC.loop(millis);
+    //if (millis > 100)
+    //    Log.debug("Delay %i", millis);
+    //boxDAC.generateZeroAudio(millis);
 }
 
 void Hackiebox::loop() {