diff --git a/src/opcodes/effects.asm b/src/opcodes/effects.asm
index db56238..e344ae3 100644
--- a/src/opcodes/effects.asm
+++ b/src/opcodes/effects.asm
@@ -313,79 +313,98 @@ su_effects_stereohelper_mono:
 SECT_TEXT(sudelay)
 
 EXPORT MANGLE_FUNC(su_op_delay,0)
-    lodsb             ; eax = delay index
-    mov     edi, eax
-    lodsb             ; eax = delay count
+    lodsw                           ; al = delay index, ah = delay count
+    push_registers VAL, COM, WRK    ; these are non-volatile according to our convention
+%ifdef INCLUDE_DELAY_MODULATION     ; TODO: at the moment, this must be manually enabled, as the PORT macro is a singleline macro and cannot toggle this. Will have to think of a good solution.
+    mov     esi, dword [WRK+su_unit.ports+su_delay_ports.delaymod]
+    mov     [INP+su_delay_ports.delaymod],esi ; move the modulation to the transformed values, as we will not have access to WRK soon
+%endif
+    movzx   ebx, al
+    apply {lea _BX,},MANGLE_DATA(su_delay_times),_BX*2,{}               ; _BP now points to the right position within delay time table
+    movzx   esi, word [_SP + su_stack.tick + PUSH_REG_SIZE(3)]          ; notice that we load word, so we wrap at 65536
+    mov     WRK, PTRWORD [_SP + su_stack.delaywrk + PUSH_REG_SIZE(3)]   ; WRK is now the separate delay workspace, as they require a lot more space
 %ifdef INCLUDE_STEREO_DELAY
     jnc     su_op_delay_mono
-    fxch
-    call    su_op_delay_mono ; do right delay
-    fxch
-    add     edi, eax ; the second delay is done with the delay time index added by count
-su_op_delay_mono:
+    push    _AX                 ; save _ah (delay count)
+    fxch                        ; r l
+    call    su_op_delay_do      ; D(r) l        process delay for the right channel
+    pop     _AX                 ; restore the count for second run
+    fxch                        ; l D(r)
+su_op_delay_mono:               ; flow into mono delay
 %endif
-    push_registers  _AX, _CX, _BX, WRK, _SI, _DI
-    mov     ebx, edi; ugly register juggling, refactor
-%ifdef DELAY_NOTE_SYNC
-    test    ebx, ebx ; note s
-    jne     su_op_delay_skipnotesync
-    fld1
-    fild    dword [_CX+su_unit.size-su_voice.workspace+su_voice.note]
-    apply fmul dword, c_i12
-    call    MANGLE_FUNC(su_power,0)
-    apply fmul dword, c_freq_normalize ; // normalize
-    fdivp   st1, st0                ; // invert to get numer of samples
-    apply fistp word, MANGLE_DATA(su_delay_times)  ; store current comb size
-su_op_delay_skipnotesync:
+    call    su_op_delay_do      ; when stereo delay is not enabled, we could inline this to save 5 bytes, but I expect stereo delay to be farely popular so maybe not worth the hassle
+    mov     PTRWORD [_SP + su_stack.delaywrk + PUSH_REG_SIZE(3)],WRK   ; move delay workspace pointer back to stack.
+    pop_registers VAL, COM, WRK
+%ifdef INCLUDE_DELAY_MODULATION
+    xor     eax, eax
+    mov     dword [WRK+su_unit.ports+su_delay_ports.delaymod], eax ; zero it
 %endif
-kmDLL_func_process:
-    mov     ecx, eax                            ;// ecx is the number of parallel delays
-    apply {mov WRK, PTRWORD},MANGLE_DATA(su_delay_buffer_ofs) ;// ebp is current delay
-    fld     st0                                 ; x x
-    fmul    dword [INP+su_delay_ports.dry]      ; dr*x x
-    fxch                                        ; x dr*x
-    fmul    dword [INP+su_delay_ports.pregain]  ; p*x dr*x
-    fmul    dword [INP+su_delay_ports.pregain]  ; p^2*x dr*x
+    ret
 
-kmDLL_func_loop:
-        mov     edi, dword [WRK + su_delayline_wrk.time]
-        inc     edi
-        and     edi, MAX_DELAY-1
-        mov     dword [WRK + su_delayline_wrk.time],edi
-        apply {movzx esi, word},MANGLE_DATA(su_delay_times),_BX*2,{} ; esi = comb size from the delay times table
-        mov     eax, edi
-        sub     eax, esi
-        and     eax, MAX_DELAY-1
-        apply fld dword, su_delayline_wrk.buffer, WRK, _AX*4,{} ; s p^2*x dr*x, where s is the sample from delay buffer
-        ;// add comb output to current output
-        fadd    st2, st0                            ; s p^2*x dr*x+s
-        fld1                                        ; 1 s p^2*x dr*x+s
-        fsub    dword [INP+su_delay_ports.damp]     ; 1-da s p^2*x dr*x+s
-        fmulp   st1, st0                            ; s*(1-da) p^2*x dr*x+s
-        fld     dword [INP+su_delay_ports.damp]     ; da s*(1-da) p^2*x dr*x+s
-        fmul    dword [WRK+su_delayline_wrk.filtstate]      ; o*da s*(1-da) p^2*x dr*x+s, where o is stored
-        faddp   st1, st0                            ; o*da+s*(1-da) p^2*x dr*x+s
-        fst     dword [WRK+su_delayline_wrk.filtstate]      ; o'=o*da+s*(1-da), o' p^2*x dr*x+s
-        fmul    dword [INP+su_delay_ports.feedback] ; f*o' p^2*x dr*x+s
-        fadd    st0, st1                            ; f*o'+p^2*x p^2*x dr*x+s
-        fstp    dword [WRK+_DI*4+su_delayline_wrk.buffer]; save f*o'+p^2*x to delay buffer
-        inc     ebx                                 ;// go to next delay lenkmh index
-        add     WRK, su_delayline_wrk.size               ;// go to next delay
-        apply mov PTRWORD, MANGLE_DATA(su_delay_buffer_ofs),{, WRK} ;// store next delay offset
-        loopne  kmDLL_func_loop
-    fstp    st0                                 ; dr*x+s1+s2+s3+...
+%ifdef INCLUDE_DELAY_MODULATION
+    %define INCLUDE_DELAY_FLOAT_TIME
+%endif
+
+;-------------------------------------------------------------------------------
+;   su_op_delay_do: executes the actual delay
+;-------------------------------------------------------------------------------
+su_op_delay_do:                                 ; x y
+    fld     st0
+    fmul    dword [INP+su_delay_ports.pregain]  ; p*x y
+    fmul    dword [INP+su_delay_ports.pregain]  ; p*p*x y
+    fxch                                        ; y p*p*x
+    fmul    dword [INP+su_delay_ports.dry]      ; dr*y p*p*x
+su_op_delay_loop:
+        %ifdef INCLUDE_DELAY_FLOAT_TIME ; delaytime modulation or note syncing require computing the delay time in floats
+            fild    word [_BX]         ; k dr*y p*p*x, where k = delay time
+            %ifdef INCLUDE_DELAY_NOTETRACKING
+                test    ah, 1 ; note syncing is the least significant bit of ah, 0 = ON, 1 = OFF
+                jne     su_op_delay_skipnotesync
+                fild    dword [_CX+su_unit.size-su_voice.workspace+su_voice.note]
+                apply fmul dword, c_i12
+                call    MANGLE_FUNC(su_power,0)
+                fdivp   st1, st0                 ; use 10787 for delaytime to have neutral transpose
+            su_op_delay_skipnotesync:
+            %endif
+            %ifdef INCLUDE_DELAY_MODULATION
+                fld     dword [INP+su_delay_ports.delaymod]
+                apply fmul dword, c_32767 ; scale it up, as the modulations would be too small otherwise
+                faddp   st1, st0
+            %endif
+            fistp   dword [_SP-4]                       ; dr*y p*p*x, dword [_SP-4] = integer amount of delay (samples)
+            mov     edi, esi                            ; edi = esi = current time
+            sub     di, word [_SP-4]                    ; we perform the math in 16-bit to wrap around
+        %else
+            mov     edi, esi
+            sub     di, word [_BX]                      ; we perform the math in 16-bit to wrap around
+        %endif
+        fld     dword [WRK+su_delayline_wrk.buffer+_DI*4]; s dr*y p*p*x, where s is the sample from delay buffer
+        fadd    st1, st0                                ; s dr*y+s p*p*x (add comb output to current output)
+        fld1                                            ; 1 s dr*y+s p*p*x
+        fsub    dword [INP+su_delay_ports.damp]         ; 1-da s dr*y+s p*p*x
+        fmulp   st1, st0                                ; s*(1-da) dr*y+s p*p*x
+        fld     dword [INP+su_delay_ports.damp]         ; da s*(1-da) dr*y+s p*p*x
+        fmul    dword [WRK+su_delayline_wrk.filtstate]  ; o*da s*(1-da) dr*y+s p*p*x, where o is stored
+        faddp   st1, st0                                ; o*da+s*(1-da) dr*y+s p*p*x
+        fst     dword [WRK+su_delayline_wrk.filtstate]  ; o'=o*da+s*(1-da), o' dr*y+s p*p*x
+        fmul    dword [INP+su_delay_ports.feedback]     ; f*o' dr*y+s p*p*x
+        fadd    st0, st2                                ; f*o'+p*p*x dr*y+s p*p*x
+        fstp    dword [WRK+su_delayline_wrk.buffer+_SI*4]; save f*o'+p*p*x to delay buffer
+        add     _BX,2                                   ; move to next index
+        add     WRK, su_delayline_wrk.size              ; go to next delay delay workspace
+        sub     ah, 2
+        jg      su_op_delay_loop                        ; if ah > 0, goto loop
+    fstp    st1                                 ; dr*y+s1+s2+s3+...
     ; DC-filtering
-    sub     WRK, su_delayline_wrk.size ; the reason to use the last su_delayline_wrk instead of su_delay_wrk is that su_delay_wrk is wiped by retriggering
     fld     dword [WRK+su_delayline_wrk.dcout]  ; o s
-    apply fmul dword, c_dc_const                      ; c*o s
+    apply fmul dword, c_dc_const                ; c*o s
     fsub    dword [WRK+su_delayline_wrk.dcin]   ; c*o-i s
-    fxch                                    ; s c*o-i
+    fxch                                        ; s c*o-i
     fst     dword [WRK+su_delayline_wrk.dcin]   ; i'=s, s c*o-i
-    faddp   st1                             ; s+c*o-i
-    apply fadd dword, c_0_5                       ;// add and sub small offset to prevent denormalization
+    faddp   st1                                 ; s+c*o-i
+    apply fadd dword, c_0_5                     ; add and sub small offset to prevent denormalization
     apply fsub dword, c_0_5
     fst     dword [WRK+su_delayline_wrk.dcout]  ; o'=s+c*o-i
-    pop_registers  _AX, _CX, _BX, WRK, _SI, _DI
     ret
 
 ;-------------------------------------------------------------------------------
@@ -393,9 +412,6 @@ kmDLL_func_loop:
 ;-------------------------------------------------------------------------------
 SECT_BSS(sudelbuf)
 
-EXPORT MANGLE_DATA(su_delay_buffer_ofs)
-                        RESPTR  1
-
 EXPORT MANGLE_DATA(su_delay_buffer)
                         resb   NUM_DELAY_LINES*su_delayline_wrk.size
 
@@ -406,11 +422,14 @@ SECT_DATA(suconst)
     %define C_DC_CONST
 %endif
 
-%ifndef C_FREQ_NORMALIZE
-    c_freq_normalize        dd      0.000092696138  ; // 220.0/(2^(69/12)) / 44100.0
-    %define C_FREQ_NORMALIZE
+%ifdef INCLUDE_DELAY_MODULATION
+    %ifndef C_32767
+        c_32767     dd      32767.0
+        %define C_32767
+    %endif
 %endif
 
+
 %endif ; DELAY_ID > -1
 
 ;-------------------------------------------------------------------------------
diff --git a/src/opcodes/effects.inc b/src/opcodes/effects.inc
index 66b3d3e..218f789 100644
--- a/src/opcodes/effects.inc
+++ b/src/opcodes/effects.inc
@@ -281,7 +281,7 @@ endstruc
     %endif
 %endmacro
 
-%define MAX_DELAY 65536
+%define MAX_DELAY 65536     ; warning: this is pretty much fixed, as we use 16-bit math to wraparound the delay buffers
 %assign NUM_DELAY_LINES 0
 
 %macro  SU_DELAY 7
@@ -297,8 +297,9 @@ endstruc
     %if %1 == STEREO
         %define INCLUDE_STEREO_DELAY
     %endif
-    %if %6 == 0
-        %define DELAY_NOTE_SYNC
+    %if (%7) & NOTETRACKING == 0
+        %define INCLUDE_DELAY_NOTETRACKING
+        %define INCLUDE_DELAY_FLOAT_TIME
     %endif
 %endmacro
 
@@ -306,7 +307,6 @@ endstruc
     SECT_DATA(sudeltim)
 
     EXPORT MANGLE_DATA(su_delay_times)
-        dw 0
 %endmacro
 
 %define SU_END_DELTIMES
@@ -325,7 +325,8 @@ endstruc
 %define DEPTH(val)      val
 %define DAMP(val)       val
 %define DELAY(val)      val
-%define COUNT(val)      val
+%define COUNT(val)      (2*val-1)
+%define NOTETRACKING    1
 
 struc   su_delay_ports
     .pregain    resd    1
@@ -333,19 +334,18 @@ struc   su_delay_ports
     .feedback   resd    1
     .damp       resd    1
     .freq       resd    1
+    .delaymod   resd    1 ; note that this is not converted from integer, only modulated
     .ports
 endstruc
 
 struc   su_delayline_wrk
-    .time       resd    1
-    .filtstate  resd    1
     .dcin       resd    1
     .dcout      resd    1
+    .filtstate  resd    1
     .buffer     resd    MAX_DELAY
     .size
 endstruc
 
-
 ;-------------------------------------------------------------------------------
 ;   COMPRES effect related defines
 ;-------------------------------------------------------------------------------
diff --git a/src/opcodes/flowcontrol.asm b/src/opcodes/flowcontrol.asm
index 79e1252..dd6c103 100644
--- a/src/opcodes/flowcontrol.asm
+++ b/src/opcodes/flowcontrol.asm
@@ -65,7 +65,7 @@ EXPORT MANGLE_FUNC(su_op_speed,0)
     fist    dword [_SP]                  ; Main stack: k=int(t+2^p-1)
     fisub   dword [_SP]                  ; t+2^p-1-k, the remainder
     pop     _AX
-    add     dword [_SP+su_stack.curtick], eax          ; add the whole ticks to song tick count, [esp+24] is the current tick in the row
+    add     dword [_SP+su_stack.rowtick], eax          ; add the whole ticks to row tick count
     fstp    dword [WRK+su_speed_wrk.remainder] ; save the remainder for future
     ret
 
diff --git a/src/player.asm b/src/player.asm
index ece24c6..c5ed9bb 100644
--- a/src/player.asm
+++ b/src/player.asm
@@ -1,19 +1,19 @@
 %if BITS == 32
-    %define BUFFER_STACK_LOC 44
+    %define BUFFER_STACK_LOC 48
     %define render_prologue pushad ; stdcall & everything nonvolatile except eax, ecx, edx
     %macro render_epilogue 0
         popad
         ret     4 ; clean the passed parameter from stack.
     %endmacro
 %elifidn __OUTPUT_FORMAT__,win64
-    %define BUFFER_STACK_LOC 48
+    %define BUFFER_STACK_LOC 56
     %define render_prologue push_registers rcx,rdi,rsi,rbx,rbp  ; rcx = ptr to buf. rdi,rsi,rbx,rbp  nonvolatile
     %macro render_epilogue 0
         pop_registers rcx,rdi,rsi,rbx,rbp
         ret
     %endmacro
 %else ; 64 bit mac & linux
-    %define BUFFER_STACK_LOC 48
+    %define BUFFER_STACK_LOC 40
     %define render_prologue push_registers rdi,rbx,rbp ; rdi = ptr to buf. rbx & rbp nonvolatile
     %macro render_epilogue 0
         pop_registers rdi,rbx,rbp
@@ -116,6 +116,7 @@ EXPORT MANGLE_FUNC(su_render,PTRSIZE)   ; Stack: ptr
     call    su_gmdls_load
 %endif
     xor     eax, eax                    ; ecx is the current row
+    push    _AX                         ; global tick time
 su_render_rowloop:                      ; loop through every row in the song
         push    _AX                     ; Stack: row pushad ptr
         call    su_update_voices        ; update instruments for the new row
@@ -125,6 +126,7 @@ su_render_sampleloop:                   ; loop through every sample in the row
             call    MANGLE_FUNC(su_run_vm,0) ; run through the VM code
             output_sound                ; *ptr++ = left, *ptr++ = right
             pop     _AX                 ; Stack: row pushad ptr
+            inc     dword [_SP + PTRSIZE] ; increment global time, used by delays
             inc     eax
             cmp     eax, SAMPLES_PER_ROW
             jl      su_render_sampleloop
@@ -132,6 +134,7 @@ su_render_sampleloop:                   ; loop through every sample in the row
         inc     eax
         cmp     eax, TOTAL_ROWS
         jl      su_render_rowloop
+    pop     _AX
     render_epilogue
 
 ;-------------------------------------------------------------------------------
diff --git a/src/sointu.asm b/src/sointu.asm
index c56fa13..2570c86 100644
--- a/src/sointu.asm
+++ b/src/sointu.asm
@@ -50,6 +50,8 @@
             pop     %1
         %endrep
     %endmacro
+
+    %define PUSH_REG_SIZE(n) (n*8)
 %else
     %define WRK ebp ; alias for unit workspace
     %define VAL esi ; alias for unit values (transformed/untransformed)
@@ -91,6 +93,8 @@
     %macro  pop_registers 1-*
         popad
     %endmacro
+
+    %define PUSH_REG_SIZE(n) 32
 %endif
 
 struc su_stack ; the structure of stack _as the units see it_
@@ -99,8 +103,13 @@ struc su_stack ; the structure of stack _as the units see it_
     .wrk        RESPTR  1
     .val        RESPTR  1
     .com        RESPTR  1
+%if DELAY_ID > -1
+    .delaywrk   RESPTR  1
+%endif
     .retaddrvm  RESPTR  1
-    .curtick    RESPTR  1
+    .rowtick    RESPTR  1    ; which tick within this row are we at
+    .row        RESPTR  1    ; which total row of the song are we at
+    .tick       RESPTR  1    ; which total tick of the song are we at
 endstruc
 
 ;===============================================================================
@@ -157,6 +166,14 @@ su_polyphony_bitmask    dd      POLYPHONY_BITMASK ; does the next voice reuse th
 SECT_TEXT(surunvm)
 
 EXPORT MANGLE_FUNC(su_run_vm,0)
+%if DELAY_ID > -1
+    %if BITS == 64 ; TODO: find a way to do this with a macro
+        mov     _AX,PTRWORD MANGLE_DATA(su_delay_buffer-su_delayline_wrk.filtstate)
+        push    _AX                                 ; reset delaywrk to first delayline
+    %else
+        push    PTRWORD MANGLE_DATA(su_delay_buffer-su_delayline_wrk.filtstate)
+    %endif
+%endif
     mov     COM, PTRWORD MANGLE_DATA(su_commands)           ; COM points to vm code
     mov     VAL, PTRWORD MANGLE_DATA(su_params)             ; VAL points to unit params
     ; su_unit.size will be added back before WRK is used
@@ -164,15 +181,6 @@ EXPORT MANGLE_FUNC(su_run_vm,0)
     push    COM                                     ; Stack: COM
     push    VAL                                     ; Stack: VAL COM
     push    WRK                                     ; Stack: WRK VAL COM
-%if DELAY_ID > -1
-    %if BITS == 64 ; TODO: find a way to do this with a macro
-        mov     r9,PTRWORD MANGLE_DATA(su_delay_buffer_ofs)
-        mov     _AX,PTRWORD MANGLE_DATA(su_delay_buffer)
-        mov     qword [r9],_AX                      ; reset delaywrk to first delayline
-    %else
-        mov     dword [MANGLE_DATA(su_delay_buffer_ofs)],MANGLE_DATA(su_delay_buffer) ; reset delaywrk to first
-    %endif
-%endif
     xor     ecx, ecx                                ; voice = 0
     push    _CX                                     ; Stack: voice WRK VAL COM
 su_run_vm_loop:                                     ; loop until all voices done
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e1c521b..a09e735 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -130,6 +130,7 @@ regression_test(test_delay_feedbackmod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND"
 regression_test(test_delay_pregainmod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
 regression_test(test_delay_dampmod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
 regression_test(test_delay_drymod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
+regression_test(test_delay_flanger "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
 
 regression_test(test_envelope_mod "VCO_SINE;ENVELOPE;SEND")
 regression_test(test_envelope_16bit ENVELOPE "" test_envelope)
diff --git a/tests/expected_output/test_delay_flanger.raw b/tests/expected_output/test_delay_flanger.raw
new file mode 100644
index 0000000..10e125f
Binary files /dev/null and b/tests/expected_output/test_delay_flanger.raw differ
diff --git a/tests/expected_output/test_delay_reverb.raw b/tests/expected_output/test_delay_reverb.raw
index 2fcac37..59e232d 100644
Binary files a/tests/expected_output/test_delay_reverb.raw and b/tests/expected_output/test_delay_reverb.raw differ
diff --git a/tests/test_delay.asm b/tests/test_delay.asm
index 7cb39e5..f180ce3 100644
--- a/tests/test_delay.asm
+++ b/tests/test_delay.asm
@@ -16,7 +16,7 @@ SU_BEGIN_PATCH
         SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE)
         SU_MULP     MONO
-        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(1),COUNT(1)
+        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1)
         SU_PAN      MONO,PANNING(64)
         SU_OUT      STEREO, GAIN(128)
     SU_END_INSTRUMENT
diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm
index 38933b2..acd2fdd 100644
--- a/tests/test_delay_dampmod.asm
+++ b/tests/test_delay_dampmod.asm
@@ -16,7 +16,7 @@ SU_BEGIN_PATCH
         SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE)
         SU_MULP     MONO
-        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(1),COUNT(1)
+        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1)
         SU_PAN      MONO,PANNING(64)
         SU_OUT      STEREO,GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO)
diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm
index e99b0a4..bcda9c5 100644
--- a/tests/test_delay_drymod.asm
+++ b/tests/test_delay_drymod.asm
@@ -16,7 +16,7 @@ SU_BEGIN_PATCH
         SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE)
         SU_MULP     MONO
-        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(1),COUNT(1)
+        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1)
         SU_PAN      MONO,PANNING(64)
         SU_OUT      STEREO,GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO)
diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm
index f873ccf..e9d5ec3 100644
--- a/tests/test_delay_feedbackmod.asm
+++ b/tests/test_delay_feedbackmod.asm
@@ -16,7 +16,7 @@ SU_BEGIN_PATCH
         SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE)
         SU_MULP     MONO
-        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(1),COUNT(1)
+        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1)
         SU_PAN      MONO,PANNING(64)
         SU_OUT      STEREO,GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO)
diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm
new file mode 100644
index 0000000..634c97d
--- /dev/null
+++ b/tests/test_delay_flanger.asm
@@ -0,0 +1,32 @@
+%define BPM 100
+%define USE_SECTIONS
+%define INCLUDE_DELAY_MODULATION
+
+%include "../src/sointu.inc"
+
+SU_BEGIN_PATTERNS
+    PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0
+SU_END_PATTERNS
+
+SU_BEGIN_TRACKS
+    TRACK VOICES(1),0
+SU_END_TRACKS
+
+SU_BEGIN_PATCH
+    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
+        SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW)
+        SU_MULP     MONO
+        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1)
+        SU_PAN      MONO,PANNING(64)
+        SU_OUT      STEREO,GAIN(128)
+        SU_OSCILLAT MONO,TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO)
+        SU_SEND     MONO,AMOUNT(65),PORT(3,delay,delaymod) + SEND_POP
+    SU_END_INSTRUMENT
+SU_END_PATCH
+
+SU_BEGIN_DELTIMES
+    DELTIME 1000
+SU_END_DELTIMES
+
+%include "../src/sointu.asm"
diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm
index db7244d..e9a8b44 100644
--- a/tests/test_delay_notetracking.asm
+++ b/tests/test_delay_notetracking.asm
@@ -20,7 +20,7 @@ SU_BEGIN_PATCH
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),FLAGS(SINE)
         SU_MULP     MONO
         SU_FILTER   MONO,FREQUENCY(32),RESONANCE(128),FLAGS(LOWPASS + BANDPASS + HIGHPASS)
-        SU_DELAY    MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1)
+        SU_DELAY    MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1) + NOTETRACKING
         SU_FILTER   MONO,FREQUENCY(24),RESONANCE(128),FLAGS(LOWPASS + BANDPASS + HIGHPASS)
         SU_MULP     MONO
         SU_PAN      MONO,PANNING(64)
@@ -29,6 +29,7 @@ SU_BEGIN_PATCH
 SU_END_PATCH
 
 SU_BEGIN_DELTIMES
+    DELTIME 10787
 SU_END_DELTIMES
 
 %include "../src/sointu.asm"
\ No newline at end of file
diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm
index 68769f9..04cf538 100644
--- a/tests/test_delay_pregainmod.asm
+++ b/tests/test_delay_pregainmod.asm
@@ -16,7 +16,7 @@ SU_BEGIN_PATCH
         SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE)
         SU_MULP     MONO
-        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(1),COUNT(1)
+        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1)
         SU_PAN      MONO,PANNING(64)
         SU_OUT      STEREO,GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO)
diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm
index 471ef8f..01ba0c8 100644
--- a/tests/test_delay_reverb.asm
+++ b/tests/test_delay_reverb.asm
@@ -16,7 +16,7 @@ SU_BEGIN_PATCH
         SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE)
         SU_MULP     MONO
-        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(1),COUNT(9)
+        SU_DELAY    MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8)
         SU_PAN      MONO,PANNING(64)
         SU_OUT      STEREO, GAIN(128)
     SU_END_INSTRUMENT
diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm
index a8540b4..09acf38 100644
--- a/tests/test_delay_stereo.asm
+++ b/tests/test_delay_stereo.asm
@@ -17,7 +17,7 @@ SU_BEGIN_PATCH
         SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE)
         SU_MULP     MONO
         SU_PAN      MONO,PANNING(64)
-        SU_DELAY    STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(1),COUNT(1)
+        SU_DELAY    STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1)
         SU_OUT      STEREO, GAIN(128)
     SU_END_INSTRUMENT
 SU_END_PATCH
@@ -27,5 +27,4 @@ SU_BEGIN_DELTIMES
     DELTIME 21025
 SU_END_DELTIMES
 
-%include "../src/sointu.asm"
-
+%include "../src/sointu.asm"
\ No newline at end of file