diff --git a/piston.tidal b/piston.tidal
index 7e8e937..3ceab2a 100644
--- a/piston.tidal
+++ b/piston.tidal
@@ -194,32 +194,33 @@ solo $ d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| speed "0.2"
    |+| vowel "e"
 
-d4 $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
-   |+| speed ((+1.3) <$> density 1.7 sinewave1)
-   |+| gain "0.9"
+d2 $ sound "[[~ [wt wtsn]] ~ wt ~]/5"
 
-d2 $ sound "[wt(5,8)]/4"
+d9 $ sound "[~ ~ ~ [~ ~ [~ wtsn] wtsn*2]]/16"
 
-d1 $ (0.5 <~) $ sound "k"
+d1 $ sound "[k sn [~ k] sn [k sn] ~]/6"
 
-d9 $ (0.5 <~) $ sound "[~ ~ ~ [~ ~ [~ wtsn] wtsn*2]]/16"
+d1 $ sound "[k*2 sn [~ k] sn [k sn] k]/6"
 
-mapM_ ($ silence) [d3,d4,d8]
+d2 $ smash 4 [0.5,0.25] $ iter 3 $ sound "[[~ [wt wtsn]] ~ wt ~]/5"
+
+d1 $ sound "[k*2 [sn ~ ~ sn] [~ k] sn [k sn] k]/6"
+   |+| gain "[1 [1 0.8] 1 1 1 1]/6"
 
 d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
    |+| cutoff "0.02"
    |+| resonance "0.001"
    |+| speed "0.7"
 
+d4 $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
+   |+| speed ((+1.3) <$> density 1.7 sinewave1)
+   |+| gain "0.9"
+
 d3 $ bassParams $ (0.25 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
    |+| cut "1"
    |+| cutoff "0.01"
    |+| resonance ((/3) <$> slow 4 saw1)
 
-d4 $ (0.5 <~) $ whenmod 5 4 (density 2) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
-   |+| speed ((+1.3) <$> density 1.7 sinewave1)
-   |+| gain "0.9"
-
 d7 silence
 
 d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.25 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
@@ -227,56 +228,44 @@ d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.25 ~>) $ chop 8 $ sou
    |+| cutoff "0.01"
    |+| resonance ((/3) <$> slow 4 saw1)
 
-d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-   |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
-
-d1 $ (0.5 <~) $ sound "{k, ~ sn}"
-
-d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-   |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
+d4 $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
+   |+| speed ((+1.3) <$> density 1.7 sinewave1)
+   |+| gain "0.9"
    |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.2875" --(138/60)/8
+   |+| pan (density 4.1 sinewave1)
 
-mapM_ ($ silence) [d1,d2,d4,d9]
+d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
+   |+| cut "1"
+   |+| cutoff "0.01"
+   |+| resonance ((/3) <$> slow 4 saw1)
+   |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
 
-{-
-piston 2.b prospective
--}
+mapM_ ($ silence) [d1,d8,d9]
 
-d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
-   |+| cutoff "0.02"
-   |+| resonance "0.001"
-   |+| speed "0.7"
-
-d2 $ sound "[[~ [wt wtsn]] ~ wt ~]/5"
-d2 silence
-d1 $ sound "[k sn [~ k] sn [k sn] ~]/6"
-
-d1 $ sound "[k*2 sn k*2 sn [k sn] k]/6"
-
-d2 $ smash 4 [0.5,0.25] $ iter 3 $ sound "[[~ [wt wtsn]] ~ wt ~]/5"
+d1 $ stack [
+   sound "k",
+   sound "[~ [sn ~ ~ sn]]/2"
+   |+| gain "[0 [1 0.8]]/2"
+]
 
 d7 $ within (0.5, 0.75) (iter 8) $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
    |+| cutoff "0.02"
    |+| resonance "0.001"
    |+| speed "0.7"
 
-{- hm
-d3 $ bassParams $ slow 6 . chop 32 $ sound "[dubb dubb:1]/2"
-   |+| vowel "e u"
--}
+d4 $ (0.5 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
+   |+| speed ((+2) <$> density 2.2 sinewave1)
+   |+| gain "0.9"
+   |+| delay "0.7" |+| delayfeedback "0.3" |+| delaytime "0.2875" --(138/60)/8
+   |+| pan (density 4.1 sinewave1)
 
-d1 $ (whenmod 7 3 (within (0.5,1.5) (superimpose ((3%4) ~>)))) $ sound "[k*2 sn k*2 sn [k sn] k]/6"
+mapM_ ($ silence) [d1,d2,d3,d4,d9]
 
-d7 silence
+d1 $ sound "[k*2 [sn ~ ~ sn] [~ k] sn]/4"
+   |+| gain "[1 [1 0.8] 1 1]/4"
 
 {-
-piston 2.b original, maybe push back to 2.c
+piston 2.b
 -}
 
 solo $ d1 $ sound "{[~ ~ ~ k:1], [~ sn]/2}"
@@ -446,7 +435,7 @@ d7 $ slow 5 . chop 15 $ sound "ice"
    |+| resonance "0.4" |+| cutoff "0.2"
    |+| delay "0.5" |+| delayfeedback "0.2" |+| delaytime "0.76" --(138/60)/3
 
-d7 silence
+mapM_ ($ silence) [d3,d7]
 
 d3 $ slow 8 $ within (0.33, 0.67) (0.25 ~>) $ slowspread ($) [rev.chop 12, rev.chop 24] $ bassParams $ sound "[dubb dubb:1]/2"
    |+| vowel "o"