diff --git a/sonic-radiance.love/datas/gamedata/skills/attack.lua b/sonic-radiance.love/datas/gamedata/skills/attack.lua
index 439cec8..c9c6e3a 100644
--- a/sonic-radiance.love/datas/gamedata/skills/attack.lua
+++ b/sonic-radiance.love/datas/gamedata/skills/attack.lua
@@ -11,31 +11,31 @@ return {
   needTarget = true,
   targetNumber = 1, -- 0 for targeting all ennemies
 
-  effectArea = {1, 0, "point", 1, true}, -- which area is affected by the attack
-  -- if not nil : {ox, oy, shape, size, affectedByDirection}
-
   choregraphy = { -- the main attack choregraphy
+    --{'goTo', "none", "target", 0, 0}
     {'playSFX', "none", 'hit'},
     {'setAnimation', "none", 'hit1start', true},
     {'sendDamage', "none", 33, 100, false, false},
-    {'addGFX',"sentDamage", 'hitGFX', 0.75, 0, true, false},
+    {'addGFX',"sentDamage", 'hitGFX', "target", 0.75, 0, true, false},
     {'playSFX', "sentDamage", 'hitconnect'},
     {'setAnimation', "none", 'hit1end', true},
 
     {'playSFX', "none", 'hit'},
     {'setAnimation', "none", 'hit2start', true},
     {'sendDamage', "none", 33, 100, false, false},
-    {'addGFX',"sentDamage", 'hitGFX', 0.75, 0, true, false},
+    {'addGFX',"sentDamage", 'hitGFX', "target", 0.75, 0, true, false},
     {'playSFX', "sentDamage", 'hitconnect'},
     {'setAnimation', "none", 'hit2end', true},
 
     {'playSFX', "none", 'hit'},
     {'setAnimation', "none", 'hit3start', true},
     {'sendDamage', "none", 33, 100, false, false},
-    {'addGFX',"sentDamage", 'hitGFX', 0.75, 0, true, false},
+    {'addGFX',"sentDamage", 'hitGFX', "target", 0.75, 0, true, false},
     {'playSFX', "sentDamage", 'hitconnect'},
     {'setAnimation', "none", 'hit3end', true},
     {'setAnimation', "none", 'idle', false},
+    --{'wait', "none", 0.2},
+    --{'goTo', "none", "start", 0, 0},
     {'wait', "none", 0.5}
   },
 
diff --git a/sonic-radiance.love/datas/gamedata/skills/spinattack.lua b/sonic-radiance.love/datas/gamedata/skills/spinattack.lua
index 441500d..0711b6f 100644
--- a/sonic-radiance.love/datas/gamedata/skills/spinattack.lua
+++ b/sonic-radiance.love/datas/gamedata/skills/spinattack.lua
@@ -9,11 +9,11 @@ return {
     {"wait", "none", 0.5},
     {"setAnimation", "none", "spin", false},
     {'playSFX', "none", 'spinrelease'},
-    {"dashForward", "none", 12, true},
-    {"sendDamageFromPos", "none", 0, 0, 120, 100, false, false, true},
-    {'addGFX', "sentDamage", 'hitGFX', 0, 0, true, false},
+    {"goTo", "none", "target", 0, 0, 0.3, true},
+    {"sendDamage", "none", 120, 100, false, false},
+    {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false},
     {'playSFX', "sentDamage", 'hitconnect'},
-    {'jumpBack', "none", true},
+    {'jumpBack', "none", 0.1, true},
     {'setAnimation', "none", 'idle', false},
   }
 }
diff --git a/sonic-radiance.love/datas/gamedata/skills/spinjump.lua b/sonic-radiance.love/datas/gamedata/skills/spinjump.lua
index 2389708..b897a8c 100644
--- a/sonic-radiance.love/datas/gamedata/skills/spinjump.lua
+++ b/sonic-radiance.love/datas/gamedata/skills/spinjump.lua
@@ -13,11 +13,11 @@ return {
   choregraphy = { -- the main attack choregraphy
     {"setAnimation", "none", "spinjump", false},
     {'playSFX', "none", 'jump'},
-    {'jumpToCursor', 'none', true},
-    {"sendDamageFromCursor", "none", 0, 0, 110, 100, false, true, true},
-    {'addGFX', "sentDamage", 'hitGFX', 0, 0, true, false},
+    {'jumpTo', 'none', "target", 0.5, 0, 0, true},
+    {"sendDamage", "none", 110, 100, false, true},
+    {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false},
     {'playSFX', "sentDamage", 'hitconnect'},
-    {'jumpBack', "none", true},
+    {'jumpBack', "none", 0.1, true},
     {'setAnimation', "none", 'idle', false},
   },