diff --git a/haddeo.scd b/haddeo.scd
index 4a17592..72d7542 100644
--- a/haddeo.scd
+++ b/haddeo.scd
@@ -1,5 +1,8 @@
 include("SuperDirt")
+
 Server.local.options.device = "Soundflower (2ch)";
 SuperDirt.start
+
 ~dirt.loadSoundFiles("~/Documents/Music/WIP/Haddeo Remix/samples/*")
-SuperDirt.stop
+
+~dirt.stop
diff --git a/haddeo.tidal b/haddeo.tidal
index a541e2f..5d18915 100644
--- a/haddeo.tidal
+++ b/haddeo.tidal
@@ -86,13 +86,9 @@ d'fx3 $
 d'nim $ superimpose (iter 4) $
   slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
-d'fx2 $ 3 ~> n "[0 1]/8" # s "duon"
-  # gain "0.9"
-
 d'nim $ superimpose (iter 4 . nim'osc) $
   slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
--- not sure this quite works so early in the tune. works better after offbeat breakdown
 d'fx1 $
   (2 ~>) $ chop 16 $
   s "dorr/4"
@@ -144,11 +140,7 @@ d'nim $ mt 16 16 $
   whenmod 5 3 rev $
   slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
-d'fx2 $ mt 16 16 $
-  stack [
-    1.75 ~> n "0/4" # s "blaster"
-    # gain "0.7"
-    ]
+d'fx2 $ mt 16 16 $ 1.75 ~> s "tubal/4"
 
 d'nim $ mt 16 16 $
   every 3 (density 2) $
@@ -158,8 +150,7 @@ d'nim $ mt 16 16 $
 
 d'fx2 $ mt 16 16 $
   stack [
-    1.75 ~> s "blaster/4"
-    # gain "0.7",
+    1.75 ~> s "tubal/4",
     chop 16 $
     3.75 ~> s "duck/4"
     # gain "0.6"
@@ -202,7 +193,11 @@ d'nim $ superimpose (iter 4 . nim'osc . (# nudge "0")) $
 
 -- pt 3: funk
 
+d'drum $ n "0*4" # s "kit"
+  # gain "0.9"
+
 d'drum $ n "0*4" # s "drum"
+  # gain "0.9"
 
 d'drum $ swing' $ stack [
   n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
@@ -215,37 +210,27 @@ d'nim $ (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
 d'drum $ swing' $ stack [
   n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
-  every' 16 16 (const $ sound "kit:3") $
-  whenmod 3 2 (density 2) $
-  withmod 11 5 0.5 1 (density 2) $
-  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit"
-  ]
-
-d'nim $ whenmod 16 12 (# vowel "[a i]/3") $
-  (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
-
-d'drum $ swing' $ stack [
-  n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
-  every' 16 16 (const $ sound "kit:3") $
   whenmod 3 2 (density 2) $
   withmod 11 5 0.5 1 (density 2) $
   n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit",
   n "[~ 1]/2" # s "sn"
-  # gain "0.8"
+  # gain "0.85"
   ]
 
+d'nim $ whenmod 16 12 (# vowel "[a i]/3") $
+  (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
+
 d'nim $ every' 16 1 (# vowel "o u") $
   whenmod 16 12 (# vowel "[a i]/3") $
   (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
 d'drum $ swing' $ stack [
   n "[1*2, 0*8, [~!! [~!! 0] ! ~!!]]/8" # s "drum",
-  every' 16 16 (const $ sound "kit:3") $
   whenmod 3 2 (density 2) $
   withmod 11 5 0.5 1 (density 2) $
   n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit",
   n "[~ [1 0/8 1/2 0/2]]/2" # s "sn"
-  # gain "0.8"
+  # gain "0.85"
   ]
 
 d'bass2 $ swing' $
@@ -255,14 +240,19 @@ d'bass2 $ swing' $
 
 d'fx2 $
   stack [
-    1.75 ~> s "blaster/4"
-    # gain "0.7",
+    1.75 ~> s "tubal/4",
     chop 16 $
     3.75 ~> s "duck/4"
     # gain "0.6"
     # speed "0.9"
     ]
 
+d'fx1 $
+  (2 ~>) $ chop 16 $ s "dorr/4"
+  # hresonance "0.05"
+  # hcutoff "200"
+  # gain "0.8"
+
 d'nim $ every' 16 1 ((# vowel "o u") . nim'del) $
   whenmod 16 12 (# vowel "[a i]/3") $
   (1 ~>) $ slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
@@ -276,12 +266,14 @@ d'fx1 $
 
 d'wax $ slow 16 . striate 256 $ s "icarus"
 
-d'fx3 $
-  (1.5 ~>) $
-  slow 4 $ chop 48 $
-  sound (samples "snoo" <$> slow 7 $ run 7)
-  # gain "0.8"
-  # cut "10"
+d'drum $ swing' $ stack [
+  n "[1*2, 0*8, [[~ 0] ~! [~!! 0] [~! 0!] ~!!]]/8" # s "drum",
+  whenmod 3 2 (density 2) $
+  withmod 11 5 0.5 1 (density 2) $
+  n "[[~ 0] [[2!! ~]/4 0]]/2" # s "kit",
+  n "[~ [1 0/8 1/2 0/2]]/2" # s "sn"
+  # gain "0.85"
+  ]
 
 d'nim $ superimpose (iter 4) $
   every' 16 1 ((# vowel "o u") . nim'del) $
@@ -297,7 +289,7 @@ d'drum $ swing' $ stack [
   n "[1*2, 0*8, [[~ 0] ~! [~!! 0] [~! 0!] ~!!]]/8" # s "drum",
   n "[~ 0]" # s "kit",
   n "[~ [1 0/8 1/2 0/2]]/2" # s "sn"
-  # gain "0.8"
+  # gain "0.85"
   ]
 
 -- outro
@@ -318,6 +310,14 @@ d'nim $ (0.25 ~>) $
   whenmod 4 2 (const silence) $
   slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
 
+d'fx3 $ 3 ~> n "[0 1]/8" # s "duon"
+  # gain "0.9"
+
+d'nim $ (0.25 ~>) $
+  whenmod 4 2 (const silence) $
+  slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
+  # vowel "o"
+
 d'drum $ swing' $ stack [
   n "[1*2, 0*8, [[~ 0] ~! [~!! 0] [~! 0!] ~!!]]/8" # s "drum",
   every' 16 16 (const $ sound "kit:3") $
@@ -326,19 +326,9 @@ d'drum $ swing' $ stack [
   # gain "0.8"
   ]
 
-d'fx2 $ 3 ~> n "[0 1]/8" # s "duon"
-  # gain "0.9"
-
-d'nim $ (0.25 ~>) $
-  whenmod 4 2 (const silence) $
-  slow 16 . striate 256 $ n "[0 1]/2" # s "nimble"
-  # vowel "o"
-
-msil [d'bass, d'hi, d'bass2, d'fx1]
+msil [d'bass, d'hi, d'bass2, d'fx1, d'fx3]
 
 d'wax $ slow 16 . striate 256 $ s "icarus"
-
-d'fx2 silence
 d'wax $ retrig $ slow 20 $ sound "icarus:1"
 
 d'drum $ swing' $ mt 16 16 $ stack [
diff --git a/samples/blaster/Blaster Fire 14.wav b/samples/blaster/Blaster Fire 14.wav
deleted file mode 100755
index 06f5b8f..0000000
Binary files a/samples/blaster/Blaster Fire 14.wav and /dev/null differ
diff --git a/samples/duon/000-duon1.wav b/samples/duon/000-duon1.wav
index 07ba9f8..5d44a14 100644
Binary files a/samples/duon/000-duon1.wav and b/samples/duon/000-duon1.wav differ
diff --git a/samples/duon/001-duon2.wav b/samples/duon/001-duon2.wav
index fa48122..05dae22 100644
Binary files a/samples/duon/001-duon2.wav and b/samples/duon/001-duon2.wav differ
diff --git a/samples/tubal/000-tubal.wav b/samples/tubal/000-tubal.wav
new file mode 100644
index 0000000..dd0732e
Binary files /dev/null and b/samples/tubal/000-tubal.wav differ
diff --git a/samples/tubal/README.txt b/samples/tubal/README.txt
new file mode 100644
index 0000000..0f842cd
--- /dev/null
+++ b/samples/tubal/README.txt
@@ -0,0 +1 @@
+musicradar-fx-samples/Synth Noises/Tubal-01.wav
\ No newline at end of file