diff --git a/live/collab/raph/jeudrill.tidal b/live/collab/raph/jeudrill.tidal
index b319351..f6b57e3 100644
--- a/live/collab/raph/jeudrill.tidal
+++ b/live/collab/raph/jeudrill.tidal
@@ -82,7 +82,7 @@ d5 $ gM3 $ gF3
   # gain 2
   # room 0.3
 d10 $ gF2 -- Menace
- $ note "<b3 ~ ~ [~!7 c4]>" -- Todo: longer sequence on 8/8?
+ $ note "<b3 ~ ~ <[~!7 c4] [~!5 c4 ef4 <c4 fs4>]>>"
  # "90s_synatm:10"
  # room 0.3 # sz 0.8
  # gain 0.95
@@ -107,13 +107,6 @@ d7 $ gM2 $ gF2
 
 
 
-d4 $ note (("<d>"))
-  # "90s_matrix:0"
-  # cut 4
-  -- # orbit 4
-
-once $ note "b" # "superpiano"
-
 
 
 
diff --git a/live/collab/raph/permanence.tidal b/live/collab/raph/permanence.tidal
index 4969e51..1c94a45 100644
--- a/live/collab/raph/permanence.tidal
+++ b/live/collab/raph/permanence.tidal
@@ -8,9 +8,8 @@ let gM1 = gMask . gMute
 let gM2 = gMask . gMute2
 let gM3 = gMask . gMute3
 d1 $ gF1 $ gM2
-  $ superimpose ((|* gain (1.3 * "^30")) . (# "hardkick:2"))
   $ midiOn "^42" (<| "k k k <k <k*2 [~ k*<1 [4 2]>]>>")
-  $ "kick:5"
+  $ "[techno:0,808bd:2,909,kick:4]"
   -- # lpf 200
 d2 $ gF1 $ gM1
   $ midiOn "^75" (ply 4)
@@ -42,6 +41,7 @@ d4 $ gF2
   # octersubbus 42 (range 0 1.5 "^17")
   # squizbus 42 (range 0 1.5 "^33")
   # crushbus 41 (range 16 2.5 "^53")
+  # gain 1
 d5 $ gF3 $ gMute3
   $ midiOff "^58" (slice 4 "<0 0 0 0 1 1 1 <1 2>>*<4!7 8>")
   $ midiOn "^58" (
diff --git a/live/midi/nova/ambient/contre_visite.tidal b/live/midi/nova/ambient/contre_visite.tidal
index bb5f669..abac0a7 100644
--- a/live/midi/nova/ambient/contre_visite.tidal
+++ b/live/midi/nova/ambient/contre_visite.tidal
@@ -34,7 +34,7 @@ d2 $ f1 $ gMute
   $ "break:20"
   # pan 0.4
   # cut 2
-  # speed (range "-0.25" 2.25 "^51")
+  # speed (range "-0.25" 2.25 "^31")
   -- # midiG' "^79" 0 1.3
 d11 $ f1 $ gMute -- Snare <3 chak reverb phantome
   $ struct "[~ t]*2"
diff --git a/live/midi/nova/ambient/empreinte_du_numerique.tidal b/live/midi/nova/ambient/empreinte_du_numerique.tidal
index 1ab9485..277f565 100644
--- a/live/midi/nova/ambient/empreinte_du_numerique.tidal
+++ b/live/midi/nova/ambient/empreinte_du_numerique.tidal
@@ -64,7 +64,7 @@ d8 $ gF1 $ gM1 -- Break bonus banane
   # cut 6
 d7 $ gF3 $ gM3 -- Back solar mandoline
   $ midiOn "^59" (off "s" (|+ note "<7 9 5 <7 12>>"))
-  $ midiOn "^91" (off "e" (|+ note 12))
+  -- $ midiOn "^91" (off "e" (|+ note 12))
   $ superimpose (|+| note "<[0 12 0]!3 [0 12 0 12]>")
   $ note "<d <d a> <gf> c>"
   # "supermandolin"
diff --git a/live/midi/nova/breaks/nuit_agitee.tidal b/live/midi/nova/breaks/nuit_agitee.tidal
index 49a9aba..5b210ae 100644
--- a/live/midi/nova/breaks/nuit_agitee.tidal
+++ b/live/midi/nova/breaks/nuit_agitee.tidal
@@ -113,4 +113,4 @@ d8 $ gM1 $ gF1
   $ "jungle_breaks:1"
   -- # lpf 5000
   # cut 8
-  # gain 0.6
+  # gain 0.9
diff --git a/live/midi/nova/dnb/force_motrice.tidal b/live/midi/nova/dnb/force_motrice.tidal
index 4574071..c513742 100644
--- a/live/midi/nova/dnb/force_motrice.tidal
+++ b/live/midi/nova/dnb/force_motrice.tidal
@@ -42,6 +42,7 @@ d5 $ gM3 $ gF2
   # crushbus 51 (range 16 2.5 "^54")
   # modIndex (range 0 2 "^34")
   # "FMRhodes1"
+  # gain 1.2
   -- # room 0.2
   -- # legato 0.25
 d7 $ gM3 $ gF3
@@ -68,7 +69,7 @@ d10
   $ slice 8 (slow 8 $ run 8)
   $ loopAt 2
   $ "risers:16"
-  # end 0.8
+  -- # end 0.8
   # att 0.04
   # rel 4
   # room 0.8
diff --git a/live/midi/nova/dnb/venons_ensemble.tidal b/live/midi/nova/dnb/venons_ensemble.tidal
index c5ead7e..b2d0c65 100644
--- a/live/midi/nova/dnb/venons_ensemble.tidal
+++ b/live/midi/nova/dnb/venons_ensemble.tidal
@@ -15,10 +15,10 @@ d1 $ gF1 $ gMute2 -- Kick variable
   $ midiOn  "^42" (struct "t t t <t!3 t*2 t!3 t*2>") -- COME FOR THE KICK
   -- $ midiOff "^42" (struct "~ <t!3 ~>") -- L'attente
   $ midiOff "^42" (fast 2 . struct "t . ~ t ~ ~")
-  $ fix (|* gain 0.8) "kick:4"
-  $ "[techno:0,808bd:2,909,kick:4]" -- Kick explosif!
+  $ fix (|* gain 0.9) "kick:4"
+  -- $ "[techno:0,808bd:2,909,kick:4]" -- Kick explosif!
   -- $ "[techno:0,808bd:2,jazz]" -- Kick raisonnable
-  -- $ "[techno:0,bskick,jazz,kick:4]" -- Kick dnb
+  $ "[techno:0,bskick,jazz,kick:4]" -- Kick dnb
   # gain 1.3
 d2 $ gF1 $ gMute $ fast 2 -- Snare dnb assorti
   $ midiOn "^42" ( -- STAY FOR THE SNARE
@@ -81,12 +81,11 @@ d6 $ gM3 $ gF3 -- Sky's companion
   # n "3"
   # cut 6
   # pan 0.9
-  # gain (range 0 1.3 "^34")
 d7 $ gF3 -- together yeah!
   $ midiOn "^91" (>| n "~ ~ ~ 11")
-  $ someCyclesBy ("^35" - "^59") (>| n "<0 1 2 3 4 5 6 7>/2")
-  $ midiOn  ("^59" - "^91") (>| n "<[~ ~ ~ <8 8 9 10>]>") -- COME <3
-  $ midiOff ("^59" + "^91" + "^35")-- YEAH
+  $ someCyclesBy ("^35" - "^59") (>| n "<0 1 2 3 4 5 6 7>/2") -- Buildup
+  $ midiOn  ("^59" - "^91") (>| n "<[~ ~ ~ <8 8 9 10>]>") -- Reponse: COME <3
+  $ midiOff ("^59" + "^91" + "^35") -- Default: YEAH
     (>| n "~ ~ ~ <~!3 <13 <14 17> <15 18> <16 19>>>")
   $ "come_voice"
   # crushbus 71 (range 16 "<5 10>" "^55")
diff --git a/live/midi/nova/lofi/lendemain_divin.tidal b/live/midi/nova/lofi/lendemain_divin.tidal
index 9abf42f..ca70c66 100644
--- a/live/midi/nova/lofi/lendemain_divin.tidal
+++ b/live/midi/nova/lofi/lendemain_divin.tidal
@@ -11,16 +11,17 @@ let gF3 = (# djfbus 3 (range 0.05 0.95 "^51"))
 let gMask = (midiOn "^41" (mask "t . <f t f <f t>> <t f f <t f>>"))
 let gMute = (midiOn "^73" (mask "f*16"))
 let gMute2 = (midiOn "^74" (mask "f*16"))
+let gMute3 = (midiOn "^75" (mask "f*16"))
 let gM = gMask . gMute
 let gM2 = gMask . gMute2
 setcps (95/60/4)
-d1 $ gMute
+d1 $ gMute $ gF1
   $ fix (|* gain 0.9) "kick:6"
   $ midiOn  "^42" (<| "k <~!8 k!56> . <~!4 k!28> k*<1!3 2>")
   $ midiOff "^42" (<| "k . ~ ~ ~ <~ k ~ [~ k]>")
   $ "[techno:0,808bd:2,909,kick:6]"
   # lpf 6000
-  # midiG' "^78" 0 1.5
+  # gain 1.5
 d2 $ gMute2 $ gF1
   $ midiOn "^43" (fast 2)
   $ midiOn "^75" (# "cp")
@@ -28,7 +29,7 @@ d2 $ gMute2 $ gF1
   # "[snare:32,snare:40,bssnare]"
   # note "-4"
   -- # lpf 2000
-  # midiG' "^79" 0 1.4
+  # gain 1.4
 d3 $ gF1 $ gMute2
   $ midiOn "^76" (ply 2)
   $ midiOn "^44" (struct "t*[16!3 <8 [8 <16 32>]>]")
@@ -41,7 +42,7 @@ d3 $ gF1 $ gMute2
   # att (slow 16 $ range 0.001 0.04 cosine)
   # rel 0.4
   # room 0.2 # dry 0.9
-  # midiG' "^80" 0 1.3
+  # gain 1.3
 d4 $ gF2 -- Basse complainte
   $ midiOn "^89" ((ply "8 <16 [16 8]>")
   -- . (# room "0 0.4")
@@ -59,14 +60,13 @@ d4 $ gF2 -- Basse complainte
   # crushbus 41 (range 16 2.5 "^53")
   # room 0.2
   # cut "41 42 43 44"
-  # midiG' "^81" 0 1.42
-d6 $ gF3
+  # gain 1.42
+d7 $ gMute3 $ gF3
   $ n "<0 0 <6 5> 0 1 1 2 7>"
   # "come_guitar" # cut 6
-  # crushbus 61 (range 16 2.5 "^54")
-  # lpfbus 62 (range 10000 7500 "^54")
+  # crushbus 61 (range 16 2.5 "^55")
+  # lpfbus 62 (range 10000 7500 "^55")
   # room 0.3
-  # midiG' "^82" 0 1
 d8 $ gM2 $ gF3
   $ midiOn "^92" (ply "<4 4 8 16>")
   $ midiOn "^20" (loopAt 4 . (# n 11)) -- Submarine break
@@ -76,60 +76,5 @@ d8 $ gM2 $ gF3
   -- $ midiOn "^36" (# n 1)
   $ "jungle_breaks:13"
   # room 0
-  # midiG' "^84" 0 1.2
+  # gain 1.2
   # cut 8
-
-once $
-
-d2
-  -- $ gF1 $ gM
-  -- $ midiOn "^43" (fast "<2!4 2 [2 4]!2 [2 . 4 8]>")
-  $ "~ s ~ s" -- Snare présent
-  # "[rampleA0:11,rampleA2:11]" -- Basic snare
-  # midiG' "^79" 0 1.5
-
-
-
-d7 $ gF3
-  $ ("h" ~>)
-  $ slice 4 (ply 4 $ slow 4 $ "<0 1 2 3>")
-  $ "shiloh:14"
-  # cut 7
-  # gain 0.7
-  # midiG' "^83" 0 1.2
-
-
-d7
-  $ slice 4 ("<<0 1 2 3>/4>")
-  $ fast 8
-  $ "shiloh:14/8"
-  # cut 7
-  # gain 0.8
-  # room "[0.5!3 <0.5 0.9>]" # dry 1.2 # sz 0.5
-
-
-once $ "dr"
-
-d1 $ gF $ gMute2 -- Kick variable
-  $ midiOn "^75" (fast 2)
-  $ midiOn  "^42" (struct "t t t <t!3 t*2 t!3 t*2>") -- COME FOR THE KICK
-  -- $ midiOff "^42" (struct "~ <t!3 ~>") -- L'attente
-  $ midiOff "^42" (fast 2 . struct "t . ~ t ~ ~")
-  $ fix (|* gain 0.8) "kick:4"
-  $ "[techno:0,808bd:2,909,kick:4]" -- Kick explosif!
-  -- $ "[techno:0,808bd:2,jazz]" -- Kick raisonnable
-  -- $ "[techno:0,bskick,jazz,kick:4]" -- Kick dnb
-  # midiG' "^78" 0 1
-d2 $ gF $ gMute $ fast 2 -- Snare dnb assorti
-  $ midiOn "^42" ( -- STAY FOR THE SNARE
-  (<| "~ cp ~ cp*<1!3 2 1 2 1 2 1 2 2 2 1 2 1 2 2 2 1 2>")
-  . (# "[snare:57,909:2]")
-  )
-  $ midiOn "^43" (<| "~ c ~ c*<1!3 2>")
-  $ midiOff ("^43"+"^42") (<| "~ <~!4 c ~!3> ~ c*<1!7 2>")
-  $ fix (|* gain 0.8) "snare"
-  $ "[snare:40,bssnare:3]"
-  # pan 0.6
-  # room 0
-  # note "-2"
-  # legato 0.5
diff --git a/live/midi/nova/lounge/invoque_ete.tidal b/live/midi/nova/lounge/invoque_ete.tidal
index 9e62e14..053b4e0 100644
--- a/live/midi/nova/lounge/invoque_ete.tidal
+++ b/live/midi/nova/lounge/invoque_ete.tidal
@@ -35,15 +35,6 @@ d3 $ gF1 -- L'inoubliable drumroll
   $ "dr*[[8 8 <8 <16 [16 32]>> 8] <8!3 [16 <16 32 [16 8] [16 32]>]>]"
   # "[drum:2,electro1:2]"
   # gain 0.8
-d8 $ f1 $ m -- Mecano Course Break
-  -- $ fast "<<4 2> 4!7 2!4 2 2 4 8>"
-  $ midiOn "^36" (|> "jungle_breaks:42")
-  $ midiOn "^60"  (slice 16 ("0*<1 2> 1 2 3*<2 1>"))
-  $ midiOn "^92"  (slice 8 (run 8) . chop 16 . (|* speed 2) . (>| "breaks165"))
-  $ loopAt 2
-  $ "breaks125:3"
-  # gain 0.8
-  # cut 8
 d4 $ f2 $ m -- Bassline variable double piste
   $ loopAt 2
   $ slice 8 (run "<4!4 8 8 [4 8 4] [8 4 8]>")
@@ -67,7 +58,7 @@ d5 $ f3 $ m -- Douce guitare juxée
   # pan 0.8
   # room 0.2 # dry 1
   # cut 3
-  # gain 0.55
+  # gain 0.65
 d7 $ f3 $ m
   $ loopAt 4
   $ mask "t(<4 8 12 16>,16)"
@@ -76,9 +67,18 @@ d7 $ f3 $ m
   $ "fpiano:13"
   # pan 0.45
   # cut 7
+d8 $ f1 $ m -- Mecano Course Break
+  -- $ fast "<<4 2> 4!7 2!4 2 2 4 8>"
+  $ midiOn "^36" (|> "jungle_breaks:42")
+  $ midiOn "^60"  (slice 16 ("0*<1 2> 1 2 3*<2 1>"))
+  $ midiOn "^92"  (slice 8 (run 8) . chop 16 . (|* speed 2) . (>| "breaks165"))
+  $ loopAt 2
+  $ "breaks125:3"
+  # gain 0.8
+  # cut 8
 d9 $ f3 $ m -- Angels of moogland
-  $ midiOn "^92" ((|* gain 0.85) .(|+ note 24))
-  $ midiOn "^60" (
+  $ midiOn "^16" ((|* gain 0.85) .(|+ note 24))
+  $ midiOn "^17" (
   superimpose (
     struct "t(5,8)"
     . arp "[down,up]"
diff --git a/live/midi/nova/lounge/suns_of_gold.tidal b/live/midi/nova/lounge/suns_of_gold.tidal
new file mode 100644
index 0000000..c62a24d
--- /dev/null
+++ b/live/midi/nova/lounge/suns_of_gold.tidal
@@ -0,0 +1,72 @@
+once $ "FMRhodes1"
+
+fs ds
+
+do
+setcps (94/60/4)
+let gMask = (midiOn "^41" (mask "t . <f t f <f t>> <t f f <t f>>"))
+let gMute = (midiOn "^73" (mask "f*16"))
+let gMute2 = (midiOn "^74" (mask "f*16"))
+let gMute3 = (midiOn "^75" (mask "f*16"))
+let gM1 = gMask . gMute
+let gM2 = gMask . gMute2
+let gM3 = gMask . gMute3
+d1 $ gF1 $ gMute2
+  $ midiOn "^42" (<| "k*4")
+  $ midiOff "^42" (<| "<k [k ~ ~ <k [k k k ~]>]>")
+  $ "[clubkick,jazz]"
+d2 $ gF1 $ gM1
+  $ fix (|+ note 2) "snare"
+  $ "~ s ~ s"
+  # "[dr55,snare:24]"
+  # rel 0.35
+d3 $ gF1 $ gM1 -- Scintillement de claquements de doigts
+  $ "~ <~!4 c!4> ~ c ~ <~!3 c ~ c!3> ~ <~!4 c!4>"
+  # "rampleC5:14"
+  # hpf 5000
+  # att 0.0
+  # rel 0.2
+  # room 0
+-- d3 $ gF1 $ "drum:2*8"
+d4 $ gF2 $ gM3
+  $ loopAt 8
+  $ chop 16
+  $ "suns_keys"
+  # n (slow 4 $ "<0 1 2 3>")
+  # crushbus 41 (range 16 2.5 "^53")
+  # room 0.7
+  # dry 0.2 # sz 0.8
+  # cut 4
+d5 $ gF3
+  $ slow 2
+  -- $ mask "<[f f t] t!3>"
+  $ struct "t(<3 5>,8) ~"
+  $ note ("[gs3 g3 fs3] ~" + "[0,<12!2 7!2>]")
+  -- $ note "<fs3>"
+  # "FMRhodes1"
+  # legato 4
+  # modIndex (range 0 5 "^54")
+  # room 0.4
+  # att 0.24
+  # rel 2
+d8 $ gF1 $ gM1
+  $ midiOn "^36" (# n 48)
+  $ midiOn "^56" (>| n "44 45")
+  $ midiOn "^60" (loopAt 0.5)
+  $ midiOn "^92" (ply "1 2 <1 2> <2 4>")
+  $ chop 16
+  $ loopAt 4
+  $ "jungle_breaks:45"
+d6 $ loopAt 2 $ "meth_bass:1" # cut 6 # pan 0.2
+d7 $ gF3 $ gMute3 -- SUNS
+  $ slice 2 "<0!3 1>/2"
+  $ "suns_voice:0"
+  # end "<0.1 0.3 1 1>"
+  # hpfbus 71 (range 0 5500 "^55")
+  # cut 7
+d10
+  $ mask "<f!28 t!4>"
+  $ loopAt 4
+  $ "risers"
+  # cut 10
+  # room 0.2
diff --git a/live/midi/nova/nujazz/cafe_bouillant.tidal b/live/midi/nova/nujazz/cafe_bouillant.tidal
index 1ffd373..2303eff 100644
--- a/live/midi/nova/nujazz/cafe_bouillant.tidal
+++ b/live/midi/nova/nujazz/cafe_bouillant.tidal
@@ -49,7 +49,7 @@ d4 $ gF2 $ gM3
   # "bassWarsaw"
 d5 $ gF3 $ gM3 -- Piano guide premier
   $ midiOn "^58" (slice 4 "<2 ~> <1 <2 [2 1]>>" . (# n 60))
-  -- $ midiOn "^90" (slice 4 "<2 ~> <1 2>" . (# n 60))
+  $ midiOn "^90" (slice 4 "2(3,8,<0!3 1>) 1(<0 1 3 [3 5]>,8)" . (# n 60))
   $ "nujazz_keys120"
   # n "<61!24 60!8>"
   # pan 0.8
diff --git a/live/midi/nova/nujazz/cafe_tiede.tidal b/live/midi/nova/nujazz/cafe_tiede.tidal
index 895069b..6f3f048 100644
--- a/live/midi/nova/nujazz/cafe_tiede.tidal
+++ b/live/midi/nova/nujazz/cafe_tiede.tidal
@@ -15,15 +15,17 @@ let gF2 = (# djfbus 2 (range 0.05 0.95 "^50"))
 let gF3 = (# djfbus 3 (range 0.05 0.95 "^51"))
 d1 $ gF1 $ gM2
   $ fix ((# lpf 150) . (|* gain 0.93)) "kick:5"
-  $ midiOn "^42" (<| "k k k <k <k*2 [k k k ~]>>")
+  $ midiOn "^42" (<| "k k k <k <k*2 [k <k ~> k ~]>>")
   $ midiOff "^42" (<| "k ~ ~ [~ <~ k>]")
   $ "[kick:5,tech:5,jazz]"
   # gain 1
 d2 $ gF1 $ gM1
-  $ midiOn "^43"  (<| "~ c ~ c")
+  $ midiOn "^43"  (<| "~ c ~ c*<1!3 2>")
   $ midiOff "^43" (<| "~ . c*<1!3 <2!3 4>> ~")
-  $ fix ((|* gain 0.8) . (# room 0)) "cp"
-  $ "[h2ogmsn:5,cp]" # room 0.4 # sz 0.5 # dry 1.2
+  -- $ fix ((|* gain 0.8) . (# room 0)) "cp"
+  $ "[h2ogmcp]"
+  # att 0
+  # rel 0.085
   # gain 1.4
   -- # lpf 4650
 d3 $ gF1 $ gM1 -- Highest hats
@@ -59,14 +61,6 @@ d7 $ gM3 $ gF3
   # cut 7
   # octerbus 71 (range 0 0.5 "^55")
   # pan 0.1
-d12 $ gM3 $ gF3
-  $ slice 4 "<<[0 1 2 3] [0 1 0 1 2 3 2 3]> [0 1 2 3]>"
-  $ chop 8
-  $ loopAt 2 $ "nujazz_keys125:44"
-  # cut 5
-  # gain 0.8
-  # pan 0.7
-  # room 0.2
 d11 $ gM3 $ gF3
   -- $ (0.5 <~)
   $ loopAt 2
@@ -78,6 +72,14 @@ d11 $ gM3 $ gF3
   # att 0.02
   # rel 7
   # gain 0.9
+d12 $ gM3 $ gF3
+  $ slice 4 "<<[0 1 2 3] [0 1 0 1 2 3 2 3]> [0 1 2 3]>"
+  $ chop 8
+  $ loopAt 2 $ "nujazz_keys125:44"
+  # cut 5
+  # gain 0.8
+  # pan 0.7
+  # room 0.2
 d8 $ gM1 $ gF1
   -- Transforms over samples
   $ midiOn "^60" (iter "1 4") -- Split
diff --git a/live/midi/nova/nujazz/salut_nu.tidal b/live/midi/nova/nujazz/salut_nu.tidal
index 2c41313..c9f50ff 100644
--- a/live/midi/nova/nujazz/salut_nu.tidal
+++ b/live/midi/nova/nujazz/salut_nu.tidal
@@ -28,7 +28,7 @@ d2 $ gF1 $ gM1
   $ midiOff "^43" (<| "~ . c*<1!3 <2!3 4>> ~")
   $ "[cp:1,rampleM1:10]"
   # gain 1.2
-  # lpf 4650
+  # lpf 2650
 d3 $ gF1 $ gM1 -- Highest hats
   $ midiOn "^44" (ply 2)
   $ midiOn "^76" (ply 2)
@@ -97,10 +97,10 @@ d7 $ gF2 $ gM3 -- Guitare egaree
   # "nujazz_wahwah125"
   # cut 7
   # pan 0.8
-  # room 0.24 # sz 0.5 # dry 0.5
+  # room 0.124 # sz 0.25 # dry 0.5
   # octersubbus 71 (range 0 2 "^55")
   # octersubsubbus 72 (range 0 3 "^55")
-  # gain 1
+  # gain 1.1
 d8 $ gF1 $ gM1 -- JazzyBelle JazzyBreak
   $ midiOn "^92" (ply "2 <2 <4 [4 8]>>")
   $ chop 16
diff --git a/live/midi/nova/techno/ete_a_mauerpark.tidal b/live/midi/nova/techno/ete_a_mauerpark.tidal
index f71a082..33f112b 100644
--- a/live/midi/nova/techno/ete_a_mauerpark.tidal
+++ b/live/midi/nova/techno/ete_a_mauerpark.tidal
@@ -1,4 +1,4 @@
--- L'Été a MauerPark
+-- L'Été a MauerPark <3
 do
 setcps (120/60/4)
 let gF =  (# djfbus 1 (range 0.05 0.95 "^49"))
@@ -47,7 +47,7 @@ d7 $ gF3 $ gM3 -- High Cello Dauphin
   # cut 7
   # room 0.2
   # pan 0.9
-# crushbus 71 (range 16 2.5 "^55")
+  # crushbus 71 (range 16 2.5 "^55")
   -- # midiG' "^83" 0 1.2
   # gain 0.7
 d3 $ gF $ gMute
@@ -61,7 +61,7 @@ d4 $ gF2 $ gM3 $ slow 2 -- Basse Germanique
   $ midiOn "^57" (rev)
   $ midiOn "^89" (struct "t*<16 32>") -- Basse folle
   $ (0.125 <~) -- Calage :)
-  $ someCyclesBy (1 - "^33") (
+  $ someCyclesBy (1 - "^33") ( -- Pattern complet
     (mask "<t!2 f t f f t t> f t@14") . (|* room 1.2)
     ) --
   $ fix ((midiOff "^57" (# silence)) . (|* gain 0.65) . (|+ note 24) . (|* gain "<0.93!3 [0.92 0.85]>") . (# cut 5))
@@ -99,10 +99,7 @@ d5 $ gF3 $ gMute2 -- Leads reponse TODO moins carre?
 d8 $ gM $ gF -- Breaks divins
   $ midiOn "^92" (off "e" id)
   $ midiOff "^60" (mask "[f t]")
-  $ someCyclesBy "^36" (loopAt 2
-      . mask "t(16,16,0)"
-      . chop 16
-      . (# n 83))
+  $ someCyclesBy "^36" (loopAt 1 . (# n 34))
   $ someCyclesBy "^56" (chop 8 . loopAt 1 . (# "fbreak120:3"))
   $ loopAt 2
   $ chop 8
@@ -139,4 +136,5 @@ d9 $ gF3 -- Nano-angels chorus of machines
 
 
 
+
 bf g bf <bf a>
diff --git a/live/techno/nightly_repair.tidal b/live/techno/nightly_repair.tidal
index d920e78..615dc24 100644
--- a/live/techno/nightly_repair.tidal
+++ b/live/techno/nightly_repair.tidal
@@ -4,58 +4,41 @@ do
 setcps (90/60/4)
 let scale = getScale (scaleTable ++ [("blues",[0, 3, 5, 6, 7, 10])])
 let modIndex = pF "modIndex"
-let gDJF1 = (# djfbus 1 (range 0.05 0.95 "^49"))
-let gDJF2 = (# djfbus 2 (range 0.05 0.95 "^50"))
-let gLPQ = (# lpqbus 3 (range 0 0.95 "^13"))
-let gHPQ = (# hpqbus 4 (range 0 0.95 "^14"))
-let g1 = (gDJF1 . gLPQ . gHPQ)
-let g2 = (gDJF2 . gLPQ . gHPQ)
-d1 $ g1 -- Le pouvoir de voler
-  $ midiOn "^74" (fast 2)
+let gMask =  (midiOn "^41" (mask "t . <f t f <f t>> <t f f <t f>>"))
+let gMute1 = (midiOn "^73" (mask "f*16"))
+let gMute2 = (midiOn "^74" (mask "f*16"))
+let gMute3 = (midiOn "^75" (mask "f*16"))
+let gM1 = gMask . gMute1
+let gM2 = gMask . gMute2
+let gM3 = gMask . gMute3
+d1 $ gMute2 $ gF1 -- Le pouvoir de voler
   $ midiOn  "^42" (<| "k k*<1!3 2> k <k k*2>")
   $ midiOff "^42" (<| "k . k(3,8)")
   $ fix (|* gain 1) "808bd"
   $ fix ((|* gain 0.8)) "909"
   $ "[jazz,909,808bd:4]"
   # gain 1.4
-d2 -- Every superhero needs a clap
+d2 $ gM1 $ gF1 -- Every superhero needs a clap
   $ midiOn "^43" (fast 2)
-  $ g1
   $ "~ cp"
   # "h2ogmcp"
   -- # note (-2)
   # gain 1.1
-d3 $ g1 -- Gretsch frappe ton os pour le renforcer
+d3 $ gM1 $ gF1 -- Gretsch frappe ton os pour le renforcer
+  $ midiOn "^76" (fast "2")
   $ midiOn "^44" (fast "1 2")
   $ sometimesBy "^52" (ply "1 2 1 2")
   $ fix ((|* gain 0.86) . (# n "[4|5]")) "gretsch"
   $ "~ h ~ h ~ h ~ h*<1 2>" # "[hh,gretsch]"
   -- # midiG' "^80" 0 1.75
-d9 $ g2 -- G0dz1ll4
-  $ midiOn "^60" (off 1 (
-    (|+ pan 0.3)
-    . (# cut 91)
-    . (|+| note "[0|12]*8")
-    . (|* gain 0.9)
-    . (# squizbus 92 (range 0 10 perlin))
-    ))
-  $ "90s_matrix:1/4"
-  # cut 9
-  # gain 0.55
-  # crushbus 9 (slow 16 $ 16 * (1 - "^56") + (range 2.6 2 (perlin)))
-  # roombus 91 (slow 16 $ range 0 0.82 perlin)
-  # dry 2
-  # sz 0.9
-  # pan 0.7
-  # midiG' "^84" 0 1.2
-d4 $ g1 -- BASSLINE VOLTAIQUE
+d4 $ gMute3 $ gF2 -- BASSLINE VOLTAIQUE
   $ midiOn "^57" ((|+ note 12) . (# legato 4))
   $ note ("<bf g bf g bf g bf c c!4 g bf c6@2>" - 24)
   -- $ note ("c6")
   # "90s_matrix:3"
   # cut 4
   # pan 0.3
-  # midiG' "^81" 0 1.3
+  # gain 1
   # lesliebus 41 (range "-1" 1 "^17")
   # lrate (slow 4 $ "<[0.7 1.2!3] 2.4 4.8 6.7>")
   # lpf 5000
@@ -63,7 +46,7 @@ d4 $ g1 -- BASSLINE VOLTAIQUE
   # crushbus 43 (range 16 2 ("^53" - 0.1 * (fast 4 perlin)))
   # lpfbus   44 (range 12000 200 "^53")
   # room 0.2
-d5 $ g2 -- BLUES RUN
+d5 $ gM3 $ gF3 -- BLUES RUN
   $ someCyclesBy (range 0.95 0.05 ("^18!15 1")) (mask "t(3,8)")
   $ slice 16 (run 16)
   $ midiOn "^58" (striate 2)
@@ -78,10 +61,26 @@ d5 $ g2 -- BLUES RUN
   )
   # "FMRhodes1"
   # crushbus 5 (range 16 4.2 "^54")
-  # midiG' "^82" 0 1.85
+  # gain 1.85
   -- # pan (slow 8 $ range 0.5 1 (saw - (slow 2 perlin)))
   # pan (slow 16 $ range 1 0.8 saw)
-
+d7 $ gM3 $ gF2 -- G0dz1ll4
+  $ midiOn "^59" (off 1 (
+    (|+ pan 0.3)
+    . (# cut 91)
+    . (|+| note "[0|12]*8")
+    . (|* gain 0.9)
+    . (# squizbus 92 (range 0 10 perlin))
+    ))
+  $ "90s_matrix:1/4"
+  # cut 9
+  # gain 0.55
+  # crushbus 9 (range 16 2.5 "^55")
+  # roombus 91 (slow 16 $ range 0 0.82 perlin)
+  # dry 2
+  # sz 0.9
+  # pan 0.7
+  # gain 1.2
 
 let scale = getScale (scaleTable ++ [("blues",["c", "ef", "f", "fs", "g", "bf"])])