diff --git a/live/techno/funk/Noise.tidal b/live/techno/funk/Noise.tidal
index c99b089..d419395 100644
--- a/live/techno/funk/Noise.tidal
+++ b/live/techno/funk/Noise.tidal
@@ -3,7 +3,7 @@ module Funk where
     $ degradeBy (slow 4 "<0.75 0.5 0.25 0.1>")
     $ someCycles (# speed 0.5)
     $ stut "[4|2]" 0.9 "[q|h]"
-    $ stut' 2 "h" (|+ note (slow 4 "<[2|4] [0 -2]>"))
+    $ stut' 2 "h" ((|* gain 0.9) . (|+ note (slow 4 "<[2|4] [0 -2]>")))
     $ "coins"
     # octave 2 -- 4=creepy
     # gain (slow 16 $ range 0.25 0.45 saw)
diff --git a/live/techno/funk/grace.tidal b/live/techno/funk/grace.tidal
index c600977..5278931 100644
--- a/live/techno/funk/grace.tidal
+++ b/live/techno/funk/grace.tidal
@@ -1,16 +1,16 @@
 -- region Touchés par la grace: techno-gospel
 -- Tags: Techno, gospel, funk
--- Ready: 8.5/10
+-- Ready: 9/10
 resetCycles
 -- endregion
 
 do
   unsolo 1 -- Kick regulier degradé
   unsolo 2 -- Cymbales gravitantes
-  unsolo 3 -- Drumroll
+  solo 3 -- Drumroll
   unsolo 4 -- Mad Bassline discrete
   solo 5 -- Lead choir
-  solo 7 -- Claps
+  unsolo 7 -- Claps
   setcps (120/60/4)
   solo 10 -- NOISE
   d10 $ funk_noise
@@ -18,11 +18,11 @@ do
     $ whenmod 16 12 (mask "t(1,4)") -- Respire
     -- $ whenmod 16 8 ( -- Double degradé
         -- sometimesBy "<0!2 0.25 [0.25 0.5]>" (fast 2 . degradeBy 0.2))
-    $ whenmod 8 6 (# lpf 200)
+    -- $ whenmod 8 6 (# lpf 200)
     $ "k k k <k k*[1|2|3|4]>"
     # "[kick:5,house]"
     # note 2
-    # gain 0.6
+    # gain 0.65
   d2 -- Cymbales gravitantes
     $ whenmod 16 8 (jux (rev . (hurry "<2!3 0.5>")))
     $ degradeBy "0 <0.5!6 0.25!2>!7" $ "ho:1*4 hc:3*4"
@@ -48,16 +48,17 @@ do
     # gain 0.9
     # cut 6
   d5 -- Chopped choir
-    $ whenmod 32 16 (slow 4)
+    $ whenmod 32 0 (slow 2) -- TODO end: Rarefy
     $ slice 16 (
       whenmod 16 12 (|> "0*4") $
       whenmod 16 8 (|> "0*8") $
-      "<2!4 <1 0>!4>"
+      "2" -- Welcome!
+      -- "0 1 <0 2> [3 4]" -- Choeurs fous!
     )
     $ every' 4 3 (superimpose (# n 1) . (# begin 0))
     $ "pray"
     # cut 3
-    # pan "0.3 0.7"
+    # pan "0.4 0.6"
     # gain 0.65
     # begin "<0.1 0.5>"
   d7 -- Claps répartis
diff --git a/live/techno/funk/mad_fonk.tidal b/live/techno/funk/mad_fonk.tidal
index df23ab1..df9cea7 100644
--- a/live/techno/funk/mad_fonk.tidal
+++ b/live/techno/funk/mad_fonk.tidal
@@ -5,12 +5,12 @@ resetCycles
 -- endregion
 
 do
-  solo 1 -- Kick
-  solo 2 -- Snare roll/rush
-  solo 3 -- Drumroll
+  unsolo 1 -- Kick
+  unsolo 2 -- Snare roll/rush
+  unsolo 3 -- Drumroll
   solo 4 -- Bassline
-  solo 5 -- Guitare intro/pompe
-  solo 6 -- Epiano groovy
+  unsolo 5 -- Guitare intro/pompe
+  unsolo 6 -- Epiano groovy
   solo 7 -- Claps from grace
   let bpm = 80 -- Que tu crois!
   setcps (bpm/60/4)
@@ -19,23 +19,23 @@ do
   d1
     $ every' 8 7 (# lpf 200)
     -- region Pauses Hip-hop
-    $ whenmod 8 6 (juxBy 0.5 rev)
+    -- $ whenmod 8 6 (juxBy 0.5 rev)
     -- $ "k . k(<3 <5 4>>,8)" -- Le simple
     -- $ "k*<1!4 2!4> . k(<3!3 <5 8>>,8)" -- L'agité
     -- region hardkick
     -- $ whenmod 32 16 (
     --   superimpose (
     --     (# "hardkick:4")
-    --     . (sometimes (stut 2 0.8 "s"))
+    --     . (sometimesBy "<0!3 0.5>" (stut 2 0.8 "s"))
     --     . (# legato 0.9)
     --     . (|* gain 0.65)
     --     )
     -- )
     -- region INTRO/Run
     $ slow 2 -- intro
-    -- $ whenmod 8 6 (# silence)
-    $ "k k k k k k k <k [~ k] k*2>"
-    # "[<reverbkick!3 ~>,kick:5]"
+    $ whenmod 8 6 (# silence)
+    $ "k k k k k k k <k [~ k] k*2 ~>"
+    # "[jazz,kick:5]"
     # gain 0.75
     # pan 0.45
   d2
@@ -63,7 +63,7 @@ do
       sometimesBy "0 1" rev)
     $ slice 8
     (
-      -- iter (slow 4 "<1 4>")
+      -- iter (slow 2 "<2 4>") $
       run 8 -- Classique: jumpy groovy
       -- "<0!3 1>*2 3*2 <0 1> 4*<2 4 8>" -- Jumpy rappel
       -- "<0 4 0 0*2> 4 <0 1 2 3> <0 4!2>" -- Attente
@@ -71,7 +71,7 @@ do
     )
     $ "fbass:8"
     # legato 1
-    -- # crush (1.5 + "6 <5 4>") -- TODO CRUSH THIS
+    -- # crush (5.5 + "6 <5 4>") -- TODO CRUSH THIS
     # gain 0.85
     # pan 0.6
   d5 -- Guitare pompe
@@ -81,16 +81,16 @@ do
     -- region Guitare pompe
     -- $ slice 8 (cat [
     --   "0*4",
-    --   "0 1 2 3",
+    --   -- "0 1 2 3",
     --   "0*4 1 3(3,8) 5",
-    --   "4 5 6 7",
-    --   "0 7 4 7",
+    --   -- "4 5 6 7",
+    --   -- "0 7 4 7",
     --   "[0 4]*4",
-    --   "7 <7 6> <3 5> <7 4>",
-    --   "4*4 . 4*<8 16>",
-    --   "7 0 7 0",
+    --   -- "7 <7 6> <3 5> <7 4>",
+    --   -- "4*4 . 4*<8 16>",
+    --   -- "7 0 7 0",
     --   "0*4"
-    -- ]) $ n 9
+    ]) $ n 9
     -- region INTRO-guitar
     $ slice 8 ( -- Intro
       "0(<1 4>,<1 4 8>) . [1*<1 2 4>, 3(<1 3 5>,8)]"
@@ -110,14 +110,20 @@ do
     $ slice 8 (
       "0 3 2 1 4 5 6 7*<1 2>" -- regulier
       -- "0 3 2 1 0 3 <2 6> 7" -- variant
+      -- "3*4 <0 5> 0 <3 4>*2 0*2 5 0 4" -- TODO FREESTYLE
       -- "0 3 2 1!5" -- repeat aigu
       -- "4!5 5 6 7*<1 2>" -- repeat end
+      -- "5!8" -- END OF FILE
     )
     $ s "fepiano"
     # n (slow 8 "<24 25>")
-    # gain 0.7
+    # gain 0.7 -- TODO OUTRO 0.7 0.67 0.57 0.47 0.37
     # cut 6
     # pan 0.7
+  d7 $ fast 2 $ s "clap"
+    # lpf 2000
+    # gain 0.65
+    # room 0.4
 
 
 9 -- ritournelle
diff --git a/live/techno/funk/pray.tidal b/live/techno/funk/pray.tidal
index 13a6a0f..b1cde12 100644
--- a/live/techno/funk/pray.tidal
+++ b/live/techno/funk/pray.tidal
@@ -1,12 +1,13 @@
 -- Pray the Funk: choeurs laudatifs
 -- Tags: Breakbeat, gospel, funk
--- Ready: 8.5/10
+-- Ready: 9/10
+
 do
-  solo 1 -- Kick chaloupe
-  solo 2 -- Gretsch snares
-  solo 3 -- AcceleRoll
-  solo 4 -- Breakbeat
-  unsolo 5 -- Lead choir
+  unsolo 1 -- Kick chaloupé
+  unsolo 2 -- Tambours de Gretsch
+  unsolo 3 -- AcceleRoll
+  solo 4 -- Broken piece
+  solo 5 -- Fragments of Wiley
   unsolo 7 -- Claps
   setcps (60/60/4)
   solo 10 -- NOISE
@@ -14,10 +15,10 @@ do
   d1
     -- KICK
     -- $ mask "t(11,12)" . fast "<2!6 4 2>" -- Folie
-    $ "k . k(<3 <5 4>>,8)" -- Le classique
+    $ "k([1|2|5],8) . k(<3 5>,8)" -- Le classique
     -- $ "k*<1!8 2!8> . k(<0 1 0 1 3 5 5 8>,8,<0!3 2>)" -- L'annonce
-    # "reverbkick"
-    # lpf 1500
+    # "[reverbkick,kick]"
+    # lpf 5000
     # gain 0.75
   d4 -- BREAKBEAT
     $ slice 8 (
@@ -46,12 +47,12 @@ do
     $ "gretsch*<8!3 [16 . [16 | 32]]>" # n "[4|5]"
     # note ("<-2 -4 -2 0>")
     # gain 0.75
-  d5 -- Lead choir
+  d5 -- Fragments of Wiley
     $ "pray" -- TODO INTRO then /4
-    -- # n "<0!4 1!8>"
-    # gain (slow 8 $ range 0.5 0.9 sine)
+    # n "<0!4 1!8>"
+    # gain (slow 8 $ range 0.5 0.75 sine)
     # cut 5
-    -- |> gain 0.65 # lpf 2000 # waveloss 12.5  -- TODO INTRO WAVELOSS 65 50 40
+    |> gain 0.65 # lpf 200 # waveloss 65  -- TODO INTRO WAVELOSS/gain 65 45 25 12.5
   d7
     $ fast 2
     $ whenmod 32 16 (whenmod 4 3 (ply "<2 3 [2 4] [3 2]>"))
diff --git a/live/techno/funk/readme.md b/live/techno/funk/readme.md
index 00b9c9a..a6dd390 100644
--- a/live/techno/funk/readme.md
+++ b/live/techno/funk/readme.md
@@ -1,6 +1,18 @@
 # FUTURE FUNK FRAGMENTS
 > From the edges of the desert,
 > lost broken tapes reveal data  
+> groovy data
+> funky data
+> a rythm from old times
+
+## WORKSHEET
+
+### Repeat 0
+> 3m next? NO
+> 16:30 ok annonce MAD
+> 29:50 fin du crush
+> 35: Ending fepiano
+> 40: EOF
 
 
 ## Pray
@@ -9,12 +21,17 @@ Intro waveloss + Break
 Puis beat ;)
 
 
+- Transition 3/5
 
 ## Grace
 
-- Transition solo/downtempo
-  - IN  4/5/7 bass/choir/claps
-  - OUT 1/5/7
+Begin 120BPM
+
+End madbass annonciatrice
+
+- Transition solo madbass / downtempo
+  - IN  2/4/7 cy/bass/claps
+  - OUT 1/4/7 kick/bass/clap
   - CPS 120->80
 
 ## Mad Fonk
@@ -41,4 +58,5 @@ d6 interdit
 
 ### Mad Piano
 
+
 ### Outro: fepiano