diff --git a/battery123.tidal b/battery123.tidal
index 1acd018..2a4238c 100644
--- a/battery123.tidal
+++ b/battery123.tidal
@@ -13,448 +13,411 @@ soundcloud.com/anny-fm/battery-123-live
 
 cps (125/60)
 
-let preload p s = d9 $ sound (samples p s) |+| end "0.00001"
-
-let halfosc = (/2).(+0.5)
-let halfosc1 = (+1).(/2)
-let thirdosc1 = (+1).(/3)
+-- shortfix for bps->cps
+let cf = slow 2
 
+-- alternative every
 let every' n o f = when ((== (o-1)) . (`mod` n)) f
 
+-- oscillations
+let halfosc = (/2).(+0.5)
+    halfosc1 = (+1).(/2)
+    thirdosc1 = (+1).(/3)
+
+-- channel mapping
+let d'drum = d1
+    d'perc = d2
+    d'bass = d3
+    d'mosq = d4
+    d'tac = d9 -- tacscan
+    d'warb = d6 -- warbler
+    d'arpy = d7
+    d'tr = d8 -- trump
+    d'bass2 = d5 -- more bass right at the end
+
 {-
 [1]
 -}
 
-d3 $ slow 4 $ s "bass3 [~ bass3] ! ~"
-  # n "0 1 0 0"
-  # begin "0.2"
+let b1'bass = s "bass3 [~ bass3] ! ~"
+              # begin "0.2"
 
-d3 $ slow 4 $ s "bass3 [~ bass3] ! ~"
+let b1'mosq = slow 8 $ rev . striate 256 $ s "hand*8"
+              # speed "0.7"
+
+let b1'perc = slow 2 $ s "uxay [~ uxay] [psr:8 uxay] ~"
+
+let b1'tac = s "[~ tacscan:13] ! ~ ~"
+             # gain "0.8"
+             # vowel (slow 3 "e u")
+
+let b1'warbler = slow 4 $ striate 32 $ s "warbler"
+                 # n (slow 7 $ run 7)
+                 # gain "0.8"
+
+d'bass $ slow 4 $ b1'bass
+
+d'bass $ slow 4 $ b1'bass
+  # n "0 1 0 0"
+
+d'bass $ slow 4 $ b1'bass
   # n "0 1 0 0"
-  # begin "0.2"
   # speed (thirdosc1 <$> slow 8 sinewave1)
 
-d4 $ slow 8 $ rev . striate 256 $ s "hand*8"
-  # speed "0.7"
+d'mosq $ b1'mosq
 
-d4 $ slow 8 $ rev . striate 256 $ s "hand*8"
-  # speed "0.7"
+d'mosq $ b1'mosq
   # shape ((/2) <$> slow (10%4) sinewave1)
 
-d2 $ slow 4 $ s "uxay [~ uxay] [psr:8 uxay] ~"
-  # n (density 3 $ run 2)
+d'perc $ cf $ b1'perc
 
-d4 $ slow 8 $ rev . striate 256 $ sound "hand*8"
-  # speed "0.7"
+d'mosq $ b1'mosq
   # shape ((/2) <$> slow (10%4) sinewave1)
   # pan (halfosc <$> slow (8%3) sinewave1)
 
-d2 $ slow 4 $ s "[uxay tok*2] [~ uxay] [psr:8 uxay] ~"
+d'perc $ cf $ b1'perc
   # n (density 3 $ run 2)
 
-d2 $ slow 2 $
-  jux (0.25 <~) $
-  slow 2 $ s "[uxay tok*2] [~ uxay] [psr:8 uxay] ~"
+d'perc $ cf $
+  jux (0.25 <~) $ b1'perc
   # n (density 3 $ run 2)
 
-d3 $ slow 2 $
+d'bass $ cf $
   spread slow [1,3] $
   striate 16 $
-  s "bass3 [~ bass3] ! ~"
+  b1'bass
   # n "0 1 0 0"
-  # begin "0.2"
   # speed (halfosc1 <$> slow 8 sinewave1)
   # gain "0.9"
 
-d1 $ slow 2 $ stack [
-  slow 2 $ s "peri:1 [~ peri:1] ! ~",
-  sound "~ psr:14"
-  ]
+d'drum $ cf $ s "~ psr:14"
 
-d1 $ slow 2 $ sound "~ psr:14"
+d'drum $ cf $
+  overlay (s "~ psr:14") $
+  slow 2 $ s "peri:1 [~ peri:1] ! ~"
 
-d1 $ slow 2 $ stack [
-  every 4 (density 1.5) $ slow 2 $ s "peri:1 [~ peri:1] ! ~",
-  sound "~ psr:14"
-  ]
+d'drum $ cf $ s "~ psr:14"
 
-d1 $ slow 2 $ sound "~ psr:14"
+d'drum $ cf $
+  overlay (s "~ psr:14") $
+  every 4 (density 1.5) $ slow 2 $ s "peri:1 [~ peri:1] ! ~"
 
-d9 $ slow 2 $
-  s "[~ tacscan:13] ! ~ ~"
-  # gain "0.8"
-  # vowel (slow 3 "e u")
+d'drum $ cf $ s "~ psr:14"
 
-d9 $ slow 2 . whenmod 7 4 (density 1.5) $
-  s "[~ tacscan:13] ! ~ ~"
-  # gain "0.8"
-  # vowel (slow 3 "e u")
+d'tac $ cf $ b1'tac
 
-d1 $ overlay (s "peri:1") $ slow 2 $
+d'tac $ cf . whenmod 7 4 (density 1.5) $ b1'tac
+
+d'drum $ overlay (s "peri:1") $ cf $
   s "~ psr:14"
 
-d1 $ slow 2 $ sound "~ psr:14"
+d'drum $ cf $ s "~ psr:14"
 
-d6 $ slow 4 $ striate 32 $
-  s "warbler"
-  # n (slow 7 $ run 7)
-  # gain "0.8"
+d'warb $ b1'warbler
 
-d2 $ slow 2 $
+d'perc $ cf $
   spread slow [2,1] $
-  jux (0.25 <~) $
-  slow 2 $ s "[uxay tok*2] [~ uxay] [psr:8 uxay] ~"
+  jux (0.25 <~) $ b1'perc
   # n (density 3 $ run 2)
 
-d1 $ overlay (s "peri:1") $ slow 2 $
+d'drum $ overlay (s "peri:1") $ cf $
   s "~ psr:14"
 
-d1 $ overlay (s "peri:1") $ slow 2 $
+d'drum $ overlay (s "peri:1") $ cf $
   every 2 (density 3) $ s "~ psr:14"
 
-mapM_ ($ silence) [d3,d9]
+mapM_ ($ silence) [d'bass, d'tac]
 
-d1 $ overlay (s "peri:1") $ slow 2 $
-  every' 8 8 (density 1.5) $ every 2 (density 3) $ sound "~ psr:14"
+d'drum $ overlay (s "peri:1") $ cf $
+  every' 8 8 (density 1.5) $
+  every 2 (density 3) $ s "~ psr:14"
 
-d2 $ slow 2 $
+d'perc $ cf $
   slow 2 . spread slow [2,4,2,3] $
-  jux (0.25 <~) $
-  slow 2 $ s "[uxay tok*2] [~ uxay] [psr:8 uxay] ~"
+  jux (0.25 <~) $ b1'perc
   # n (density 3 $ run 2)
 
-d4 silence
+d'mosq silence
 
-d1 $ slow 2 $
-  every' 8 8 (density 1.5) $ every 2 (density 3) $ sound "~ psr:14"
+d'drum $ cf $
+  every' 8 8 (density 1.5) $ every 2 (density 3) $ s "~ psr:14"
 
-d1 silence
-d2 silence
+d'drum silence
 
 {-
 [2]
 -}
 
-d2 $ slow 2 $ s "uxay:1*2"
+let b2'uxp = (# gain "0.8") .
+             (# speed "[0.7 1 1.2]/2")
 
-d2 $ slow 2 $ s "uxay*4"
+let b2'psr = s "psr:8*4 psr:8*2"
+             # gain "0.6"
+    b2'psrf = s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
+              # gain "0.6"
+
+let b2'trump p = whenmod 5 4 rev $ s p
+                 # n (slow 3.2 $ run 4)
+                 # gain "0.8"
+                 # speed (halfosc1 <$> slow 4 sinewave1)
+                 # vowel (slow 3.2 "a e o")
+                 # shape "0.6"
+
+let b2'bass = slow 8 $ s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbass]] [~ jvbass !]"
+              # n (slow 2.8 "0 1 2")
+              # vowel "i"
+              # speed "0.8"
+
+let b2'arpy = s "arpy*8"
+              # n "4 2 7 2"
+              # gain "0.7"
+
+
+d'perc $ cf $ s "uxay*2"
+  # n "1"
+
+d'perc $ cf $ s "uxay*4"
   # n "1 0 1 2"
 
-d1 $ slow 2 $
-  s "psr:8*4 psr:8*2"
-  # gain "0.6"
-
-d1 $ slow 2 $
-  s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
-  # gain "0.6"
-
-d1 $ slow 2 $
-  every 3 (0.125 <~) $
-  s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
-  # gain "0.6"
-
-d1 $ overlay (s "peri:1") $ slow 2 $
-  every 3 (0.125 <~) $
-  s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
-  # gain "0.6"
-
-d2 $ slow 2 $ brak $
-  s "uxay*4"
+d'perc $ cf $ s "uxay*4"
   # n "1 0 1 2"
-  # gain "0.8"
   # speed "[0.7 1 1.2]/2"
+
+d'drum $ cf $ b2'psr
+d'drum $ cf $ b2'psrf
+d'drum $ cf $ every 3 (0.125 <~) $ b2'psrf
+
+d'drum $ overlay (s "peri:1") $
+  cf $ every 3 (0.125 <~) $ b2'psrf
+
+d'warb silence
+
+d'perc $ cf $ brak $
+  b2'uxp $ s "uxay*4"
+  # n "1 0 1 2"
   # shape "0.4 0.3 0.6"
 
-d1 $ slow 2 $
-  every 3 (0.125 <~) $
-  s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
-  # gain "0.6"
+d'drum $ cf $ -- overlay (s "peri:1") $
+  every 3 (0.125 <~) $ b2'psrf
 
-d6 silence
+d'tr $ cf $ b2'trump "[~ trump ! !] ~"
 
-d8 $ slow 2 $ whenmod 5 4 rev $ s "[~ trump ! !] ~"
-  # n (slow 3.2 $ run 4)
-  # gain "0.8"
+d'tr $ cf $ b2'trump "[~ trump ! !] ~"
   # speed (halfosc1 <$> slow 4 sinewave1)
-  # vowel (slow 3.2 "a e o")
-  # shape "0.6"
 
-d1 $ overlay (s "peri:1") $ slow 2 $
-  every 3 (0.125 <~) $
-  s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
-  # gain "0.6"
+d'drum $ overlay (s "peri:1") $
+  cf $ every 3 (0.125 <~) $ b2'psrf
 
-d2 $ brak . iter 4 $
-  s "uxay*4"
+d'perc $ brak . iter 4 $
+  b2'uxp $ s "uxay*4"
   # n "1 0 1 2"
-  # gain "0.8"
-  # speed "[0.7 1 1.2]/2"
   # shape "0.4 0.3 0.6"
 
-d8 $ slow 2 $ whenmod 5 4 rev $ s "trump*8"
-  # n (slow 3.2 $ run 4)
-  # gain "0.8"
+d'tr $ cf $ b2'trump "trump*8"
   # speed (halfosc1 <$> slow 4 sinewave1)
-  # vowel (slow 3.2 "a e o")
-  # shape "0.6"
 
-d3 $ slow 8 $ s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbass]] [~ jvbass !]"
-  # n (slow 2.8 "0 1 2")
-  # vowel "i"
-  # speed "0.8"
+-- quickly
+d'bass $ b2'bass
+d'tr silence
 
-d8 silence
-
-d3 $ slow 8 $ s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbass]] [~ jvbass !]"
-  # n (slow 2.8 "0 1 2")
-  # vowel "i"
-  # speed "0.8"
+d'bass $ b2'bass
   # shape "0.3" -- increase 0->0.3
 
-d3 $ slow 8 $ s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbass]] [~ jvbass !]"
-  # n (slow 2.8 "0 1 2")
-  # vowel "i"
-  # speed "0.8"
+d'bass $ b2'bass
   # shape (halfosc <$> saw1)
 
-d7 $ slow 2 $
-  s "arpy*8"
-  # n "4 2 7 2"
-  # gain "0.7"
+d'arpy $ cf $ b2'arpy
 
-mapM_ ($ silence) [d2,d3]
+mapM_ ($ silence) [d'perc, d'bass]
 
-d7 $ slow 2 $
-  iter 9 $
-  s "arpy*8"
-  # n "4 2 7 2"
-  # gain "0.7"
+d'arpy $ cf $ iter 9 $ b2'arpy
 
-d1 $ slow 2 $
-  every 3 (0.125 <~) $
-  s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
-  # gain "0.6"
+d'drum $ -- overlay (s "peri:1") $
+  cf $ every 3 (0.125 <~) $ b2'psrf
 
-d2 $ slow 2 . brak $
-  s "uxay*4"
+d'perc $ cf $ brak $
+  b2'uxp $ s "uxay*4"
   # n "1 0 1 2"
-  # gain "0.8"
-  # speed "[0.7 1 1.2]/2"
   # shape "0.4 0.3 0.6"
 
-d2 $ brak . iter 4 $
-  s "uxay*4"
+d'perc $ brak . iter 4 $
+  b2'uxp $ s "uxay*4"
   # n "1 0 1 2"
-  # gain "0.8"
-  # speed "[0.7 1 1.2]/2"
   # shape "0.4 0.3 0.6"
 
-d1 $ overlay (s "peri:1") $ slow 2 $
-  every 3 (0.125 <~) $
-  s "[[psr:8*4 psr:8*2] ! ! psr:8*8]/4"
-  # gain "0.6"
+d'drum $ overlay (s "peri:1") $
+  cf $ every 3 (0.125 <~) $ b2'psrf
 
-mapM_ ($ silence) [d1,d2]
+mapM_ ($ silence) [d'drum, d'perc]
 
 {-
 [3]
 -}
 
-d7 $ slow 2 $
+let b3'perc = s "[tok*2 [rm tok]] [psr:14 tok*2]"
+
+let b3'bass = s "bass*4"
+              # n "0 1"
+              # begin "0.4"
+              # speed "1.2"
+              # shape "0.2"
+    b3'bassf = s "{bass*4, wobble*3}"
+               # n "0 1"
+               # begin "0.4"
+               # speed "1.2"
+               # shape "0.2"
+
+let b3'drum = slow 2 $ s "peri:1 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~"
+    b3'drumf = slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~"
+
+d'arpy $ cf $
   whenmod 7 4 (|+| vowel "a") $ -- this not used in brighton 2014 live rec.
-  iter 9 $
-  s "arpy*8"
-  # n "4 2 7 2"
-  # gain "0.7"
+  iter 9 $ b2'arpy
 
-d2 $ slow 2 $
+d'perc $ cf $
   slow 2 . spread slow [2,4,2,3] $
-  jux (0.25 <~) $
-  slow 2 $ s "[uxay tok*2] [~ uxay] [psr:8 uxay] ~"
+  jux (0.25 <~) $ b1'perc
   # n (density 3 $ run 2)
 
-d1 $ slow 2 $ s "[tok*2 [rm tok]] [psr:14 tok*2]"
+d'drum $ cf $ b3'perc
+d'bass $ cf $ b3'bass
 
-d3 $ slow 2 $
-  sound (samples "bass*4" "0 1")
-  # begin "0.4"
-  # speed "1.2"
-  # shape "0.2"
-
-d1 $ slow 2 $
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-
-d3 $ slow 2 $
+d'bass $ cf $
   whenmod 7 6 (density 1.5) $
-  sound (samples "bass*4" "0 1")
-  # begin "0.4"
-  # speed "1.2"
-  # shape "0.2"
+  b3'bass
 
-d1 $ slow 2 $
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
+d'drum $ cf $ b3'perc
   # n (slow 3 $ run 4)
 
-d3 $ slow 2 $
+d'bass $ cf $
   spread slow [2,(7%4)] $
   whenmod 7 6 (density 1.5) $
-  sound (samples "bass*4" "0 1")
-  # begin "0.4"
-  # speed "1.2"
-  # shape "0.2"
+  b3'bass
 
-d3 $ slow 2 $
+d'bass $ cf $
   spread slow [2,(7%4)] $
   whenmod 7 6 (density 1.5) $
   iter 4 $
-  sound (samples "bass*4" "0 1")
-  # begin "0.4"
-  # speed "1.2"
-  # shape "0.2"
+  b3'bass
 
-d9 $ slow 2 . whenmod 7 4 (density 1.5) $
-  s "[~ tacscan:13] ! ~ ~"
-  # gain "0.8"
-  # vowel (slow 3 "e u")
+d'tac $ cf . whenmod 7 4 (density 1.5) $ b1'tac
 
-d7 $ slow 2 $
-  iter 9 $
-  s "arpy*8"
-  # n "4 2 7 2"
-  # gain "0.7"
+d'mosq $ b1'mosq
+  # shape ((/2) <$> slow (10%4) sinewave1)
+  # pan (halfosc <$> slow (8%3) sinewave1)
 
-d3 silence
+d'arpy $ cf $ iter 9 $ b2'arpy
 
-d1 $ slow 2 $ stack [
-  slow 2 $ s "peri:1 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~",
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+-- quickly
+mapM_ ($ silence) [d'bass, d'mosq]
 
-d9 silence
+d'drum $ cf $
+  overlay (b3'drum) $
+  (b3'perc # n (slow 3 $ run 4))
 
-d1 $ slow 2 $ stack [
-  slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~",
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+d'tac silence
 
-d2 $ brak . iter 4 $
+d'drum $ cf $
+  overlay (b3'drumf) $
+  (b3'perc # n (slow 3 $ run 4))
+
+d'mosq $ b1'mosq
+  # shape ((/2) <$> slow (10%4) sinewave1)
+  # pan (halfosc <$> slow (8%3) sinewave1)
+
+d'perc $ brak . iter 4 $
   s "uxay*4"
   # n "1 0 1 2"
   # gain "0.8"
   # speed "[0.7 1 1.2]/2"
   # shape "0.4 0.3 0.6"
 
-d3 $ slow 2 $
+d'bass $ cf $
   spread slow [2,(7%4)] $
   whenmod 7 6 (density 1.5) $
   iter 4 $
-  sound (samples "bass*4" "0 1")
-  # begin "0.4"
-  # speed "1.2"
-  # shape "0.2"
+  b3'bass
 
-d9 $ slow 2 . whenmod 7 4 (density 1.5) $
-  s "[~ tacscan:13] ! ~ ~"
-  # gain "0.8"
-  # vowel (slow 3 "e u")
+d'tac $ cf . whenmod 7 4 (density 1.5) $ b1'tac
 
-d3 $ slow 2 $
+d'bass $ cf $
   spread slow [2,(7%4)] $
   whenmod 7 6 (density 1.5) $
   iter 4 $
-  sound (samples "{bass*4, wobble*3}" "0 1")
-  # begin "0.4"
-  # speed "1.2"
-  # shape "0.2"
+  b3'bassf
 
-mapM_ ($ silence) [d2,d3,d9]
+mapM_ ($ silence) [d'perc, d'tac]
 
-d1 $ slow 2 $ stack [
-  slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~",
+d'drum $ cf $
+  overlay (b3'drumf) $
   whenmod 5 3 (density 2) $
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+  (b3'perc # n (slow 3 $ run 4))
 
-d1 $ slow 2 $ stack [
-  slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~",
+d'drum $ cf $
+  overlay (b3'drumf) $
   whenmod 5 3 (density 2) $
   iter 2 $
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+  (b3'perc # n (slow 3 $ run 4))
 
-d1 $ slow 2 $ stack [
-  whenmod 8 7 rev $
-  slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~",
+d'drum $ cf $
+  every' 8 8 rev $
+  overlay (b3'drumf) $
   whenmod 5 3 (density 2) $
   iter 2 $
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+  (b3'perc # n (slow 3 $ run 4))
 
-d1 $ slow 2 $ stack [
+d'drum $ cf $
   every 3 rev $
-  whenmod 8 7 rev $
-  slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~",
+  every' 8 8 rev $
+  overlay (b3'drumf) $
   whenmod 5 3 (density 2) $
   iter 2 $
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+  (b3'perc # n (slow 3 $ run 4))
 
-d1 $ slow 2 $ stack [
+mapM_ ($ silence) [d'bass, d'arpy]
+
+-- remove kick
+d'drum $ cf $
   whenmod 5 3 (density 2) $
   iter 2 $
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+  (b3'perc # n (slow 3 $ run 4))
 
-d2 $ slow 2 $
+d'mosq silence
+
+d'perc $ cf $
   slow 2 . spread slow [2,4,2,3] $
-  jux (0.25 <~) $
-  slow 2 $ s "[uxay tok*2] [~ uxay] [psr:8 uxay] ~"
+  jux (0.25 <~) $ b1'perc
   # n (density 3 $ run 2)
 
-d1 $ slow 2 $ stack [
-  slow 2 $ s "peri:1*2 [~ ~ ~ peri:1] [~ peri:1 peri:1 ~] ~",
-  s "[tok*2 [rm tok]] [psr:14 tok*2]"
-  # n (slow 3 $ run 4)
-  ]
+d'drum $ cf $
+  overlay (b3'drumf) $
+  (b3'perc # n (slow 3 $ run 4))
 
-d2 $ brak . iter 4 $
+d'perc $ brak . iter 4 $
   s "uxay*4"
   # n "1 0 1 2"
   # gain "0.8"
   # speed "[0.7 1 1.2]/2"
   # shape "0.4 0.3 0.6"
 
-d3 $ slow 8 $ s "[jvbass ~] [jvbass [~ ~ ~ ~ jvbass]] [~ [~ ~ ~ ~ jvbass]] [~ jvbass !]"
-  # n (slow 2.8 "0 1 2")
-  # vowel "i"
-  # speed "0.8"
+d'bass $ b2'bass
   # shape (halfosc <$> saw1)
 
-d9 $ slow 2 . whenmod 7 4 (density 1.5) $
-  s "[~ tacscan:13] ! ~ ~"
-  # gain "0.8"
-  # vowel (slow 3 "e u")
+d'tac $ cf . whenmod 7 4 (density 1.5) $ b1'tac
 
-d6 $ slow 4 $ striate 32 $
-  s "warbler"
-  # n (slow 7 $ run 7)
-  # gain "0.8"
+d'bass2 $ slow 4 $ b1'bass
+  # n "0 1 0 0"
+  # speed (thirdosc1 <$> slow 8 sinewave1)
 
-d7 $ slow 2 $
-  iter 9 $
-  s "arpy*8"
-  # n "4 2 7 2"
-  # gain "0.7"
+d'arpy $ cf $ iter 9 $ b2'arpy
+d'warb $ b1'warbler
+
+d'mosq $ b1'mosq
+  # shape ((/2) <$> slow (10%4) sinewave1)
+  # pan (halfosc <$> slow (8%3) sinewave1)
+
+mapM_ ($ silence) [d'perc, d'bass, d'tac, d'bass2, d'mosq]
+d'drum silence
+d'arpy silence
 
-mapM_ ($ silence) [d2,d3,d9]
-d1 silence
-d7 silence
 hush