diff --git a/live/techno/funk/Noise.tidal b/live/techno/funk/Noise.tidal
index d419395..530ac32 100644
--- a/live/techno/funk/Noise.tidal
+++ b/live/techno/funk/Noise.tidal
@@ -6,7 +6,9 @@ module Funk where
     $ 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)
+    # gain (slow 16 $ range 0.25 0.4 saw)
+    # pan perlin
+    # gain 0.4
     )
     $ superimpose (const -- Insectes
     $ slow 4
@@ -18,8 +20,8 @@ module Funk where
     $ superimpose (const -- Fond diffus cosmologique
     $ slow (slow 4 "<2 4 8>")
     $ stut' 4 "e" (|+ note (scale "major" "[2|5]"))
-    $ s "cosmicg:0"
-    # gain (slow 33 $ range 0.15 0.25 perlin)
+    $ s "~ cosmicg:0"
+    # gain (slow 33 $ range 0.15 0.2 perlin)
     # speed (range 0.125 0.95 perlin)
     # pan (range 0.4 0.6 perlin)
     )
@@ -31,8 +33,6 @@ module Funk where
     # pan (slow 4 $ range 0.45 0.55 perlin)
     # gain 0
 
-
-
 d10
 -- $ (* gain 0.75)
 $ funk_noise
diff --git a/live/techno/funk/grace.tidal b/live/techno/funk/grace.tidal
index 5278931..30ca6bb 100644
--- a/live/techno/funk/grace.tidal
+++ b/live/techno/funk/grace.tidal
@@ -40,15 +40,16 @@ do
     $ slice 8 (
       stack [
       "0 1 2 3 4 5 6 7*<1 2 4 1>" -- TODO ','' then stack
-      -- "0(3,8)",
-      -- "0 0 0 0"
+      -- "0(3,8)", -- Megamask!
+      -- "0 0 0 0", -- MULTIMASK!
+      -- "<0 1 2 3 4 5 6 7>*8" -- TODO Manual Danse des masques!
       ]
       )
     $ s "fbass:8"
-    # gain 0.9
+    # gain 0.75
     # cut 6
   d5 -- Chopped choir
-    $ whenmod 32 0 (slow 2) -- TODO end: Rarefy
+    -- $ whenmod 32 0 (slow 2) -- TODO end: Rarefy
     $ slice 16 (
       whenmod 16 12 (|> "0*4") $
       whenmod 16 8 (|> "0*8") $
@@ -59,7 +60,7 @@ do
     $ "pray"
     # cut 3
     # pan "0.4 0.6"
-    # gain 0.65
+    # gain 0.55
     # begin "<0.1 0.5>"
   d7 -- Claps répartis
     $ jux (# lpf 2000)
diff --git a/live/techno/funk/mad_fonk.tidal b/live/techno/funk/mad_fonk.tidal
index df9cea7..e448b5d 100644
--- a/live/techno/funk/mad_fonk.tidal
+++ b/live/techno/funk/mad_fonk.tidal
@@ -19,8 +19,8 @@ do
   d1
     $ every' 8 7 (# lpf 200)
     -- region Pauses Hip-hop
-    -- $ whenmod 8 6 (juxBy 0.5 rev)
-    -- $ "k . k(<3 <5 4>>,8)" -- Le simple
+    $ 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 (
@@ -40,11 +40,9 @@ do
     # pan 0.45
   d2
     $ someCycles (hurry 2)
-    $ juxBy 0.75 rev
+    $ juxBy 0.75 (rev . sometimes (mask "t(16,16)" . ply 2))
     -- region Manual snare rush
-    -- $ "~ s*4"
-    -- $ "~ s*<1!4 2!4 4!2 8 4!4 16 2!3 [4 8] [16 32]>" -- FIXME Rework
-    $ "~ s*<1 2 4 8 4 2 1 4 8 8 4 8 1 2 8 4>"
+    $ "~ s*<1 <2 <4 <8 [8 16]>>>>"
     # "snare:3"
     # note ("<0 -1 -2 -3>")
     # gain 0.65
@@ -111,9 +109,10 @@ do
       "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 1 2 [3*<4 2>]!4 [5 <4 5>]"
       -- "0 3 2 1!5" -- repeat aigu
       -- "4!5 5 6 7*<1 2>" -- repeat end
-      -- "5!8" -- END OF FILE
+      -- "5!7 7" -- END OF FILE
     )
     $ s "fepiano"
     # n (slow 8 "<24 25>")
@@ -124,12 +123,3 @@ do
     # lpf 2000
     # gain 0.65
     # room 0.4
-
-
-9 -- ritournelle
-10 -- pause fin
-11 -- montee finale?
-
-once $ s "fepiano:0" # gain 0.95 # cut 19
-
-solo 10
diff --git a/live/techno/funk/readme.md b/live/techno/funk/readme.md
index a6dd390..131f14e 100644
--- a/live/techno/funk/readme.md
+++ b/live/techno/funk/readme.md
@@ -25,10 +25,17 @@ Puis beat ;)
 
 ## Grace
 
+
 Begin 120BPM
 
+_Freestyle stack de masques!_
+
+**Do not revive Wiley**
+
 End madbass annonciatrice
 
+
+
 - Transition solo madbass / downtempo
   - IN  2/4/7 cy/bass/claps
   - OUT 1/4/7 kick/bass/clap