diff --git a/piston.tidal b/piston.tidal
index e72f52c..fc2bb2d 100644
--- a/piston.tidal
+++ b/piston.tidal
@@ -193,9 +193,7 @@ solo $ d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| speed "0.2"
    |+| vowel "e"
 
-d4 $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
-   |+| gain "0.7"
-   |+| speed ((+3) <$> density 2.8 sinewave1)
+d4 $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
 
 d2 $ sound "[wt(5,8)]/4"
 
@@ -213,10 +211,6 @@ d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
    |+| resonance "0.001"
    |+| speed "0.7"
 
-d4 $ whenmod 7 5 rev $ rev . chop 16 $ sound "[bz(3,8)]/2"
-   |+| gain "0.7"
-   |+| speed ((+3) <$> density 2.8 sinewave1)
-
 d3 $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
    |+| cut "1"
    |+| cutoff "0.01"
@@ -233,31 +227,27 @@ d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ soun
    |+| resonance ((/3) <$> slow 4 saw1)
    |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
 
-d9 silence
-
 d1 $ (0.5 <~) $ stack [
    whenmod 4 3 (density 1.5) $ whenmod 9 2 ((0.25 <~)) $ sound "~ k",
    whenmod 10 5 (superimpose (0.25 ~>)) $ (0.75 ~>) $ sound "[~ sn]/2"
 ]
 
-d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| speed "0.2"
-   |+| vowel "e"
+d4 $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
 
-d7 $ whenmod 5 3 (slow 1.5) $ rev $ stack [
-   smash 64 [0.5,1] $ gprop $ sound "~ gnome"
-   |+| pan (slow 4 sinewave1),
-   smash 64 [(1/2.5),1] $ gprop $ sound "~ gnome"
-   |+| pan ((0.5 <~) $ slow 4 sinewave1)
-]
+d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
+   |+| cutoff "0.02"
+   |+| resonance "0.001"
+   |+| speed "0.7"
 
-d7 silence
+mapM_ ($ silence) [d1,d3,d4,d9]
 
 {-
 piston 2.b
 -}
 
-solo $ d1 $ sound "{[~ ~ ~ k:1], [~ sn]/2}"
+d1 $ sound "{[~ ~ ~ k:1], [~ sn]/2}"
+
+mapM_ ($ silence) [d2,d7]
 
 d2 $ sound "~ wt wt wtsn/8"
    |+| shape ((/2) <$> density 1.2 saw1)
@@ -272,14 +262,14 @@ d1 $ sound "{[k ~ ~ k:1], [~ sn]/2}"
 d3 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
 
-d4 $ whenmod 5 3 rev $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParams $ sound "fly:1"
+d5 $ whenmod 5 3 rev $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParams $ sound "fly:1"
    |+| speed "0.7"
    |+| shape ((/2) <$> density 2.1 saw1)
 
 d3 $ whenmod 3 2 (density 1.6) $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
 
-d4 silence
+d5 silence
 
 d3 $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
@@ -326,7 +316,7 @@ d6 $ within (0, 0.5) rev $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~
    |+| shape ((/3) <$> density 3 sinewave1)
    |+| delay "0.3" |+| delayfeedback "0.2" |+| delaytime "0.2875" --(138/60)/8
 
-d4 $ whenmod 5 3 rev $ brak $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParams $ sound "fly:1"
+d5 $ whenmod 5 3 rev $ brak $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParams $ sound "fly:1"
    |+| speed "0.7"
    |+| shape ((/2) <$> density 2.1 saw1)
 
@@ -344,7 +334,7 @@ d3 $ (|+| gain ((*0.7) <$> saw1)) $ every 2 (density 2) $ whenmod 3 2 (density 1
    |+| cut "1"
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 
-mapM_ ($ silence) [d1,d4]
+mapM_ ($ silence) [d1,d5]
 
 {-
 piston 2.c
@@ -357,9 +347,7 @@ d1 $ stack [
 
 d2 $ sound "[~ [~ ~ ~ wt] wt*2 wt]/8"
 
-d4 $ whenmod 4 2 rev $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| shape ((/3) <$> slow 4 saw1)
-   |+| vowel "[e a]"
+d4 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
 
 d2 $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
    |+| speed ((+0.6).(/2) <$> density 1.8 sinewave1)
@@ -372,7 +360,8 @@ d1 $ stack [
 d2 $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
    |+| speed ((+0.6).(/2) <$> density 1.8 sinewave1)
 
-mapM_ ($ silence) [d3,d4]
+d2 $ jux (2 ~>) $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
+   |+| speed ((+0.6).(/2) <$> density 1.8 sinewave1)
 
 {-
 piston 3.a