diff --git a/sonic-radiance.love/datas/gamedata/skills/attack.lua b/sonic-radiance.love/datas/gamedata/skills/attack.lua
index cbcafb0..321f6fd 100644
--- a/sonic-radiance.love/datas/gamedata/skills/attack.lua
+++ b/sonic-radiance.love/datas/gamedata/skills/attack.lua
@@ -19,7 +19,7 @@ return {
     {"wait", "none", 0.3},
     {"setAnimation", "none", "spin", false},
     {'playSFX', "none", 'spinrelease'},
-    {"waitActorFinished", "none", "goTo"},
+    {"waitFor", "none", "actionFinished:playerMove"},
     {"sendDamage", "none", 100, "basic", "none", false},
     {'addGFX', "sentDamage", 'hitGFX', "target", 0, 0, true, false},
     {'playSFX', "sentDamage", 'hitconnect'},
diff --git a/sonic-radiance.love/datas/parsers/choregraphystep.lua b/sonic-radiance.love/datas/parsers/choregraphystep.lua
index 6e230cd..2c40ccb 100644
--- a/sonic-radiance.love/datas/parsers/choregraphystep.lua
+++ b/sonic-radiance.love/datas/parsers/choregraphystep.lua
@@ -11,6 +11,7 @@ return {
     ["jumpTo"] = {"origin", "x", "y", "duration", "blockProcess"},
     ["jumpBack"] = {"duration", "blockProcess"},
     ["waitActorFinished"] = {"waitFor"},
+    ["waitFor"] = {"waitFor"},
     ["addQTE"] = {"qteData", "origin", "blockProcess"},
     ["useItemEffect"] = {},
     --[name] = {args},
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/init.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/init.lua
index 9df3c40..478299b 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/init.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/init.lua
@@ -10,6 +10,7 @@ actions["playSFX"] = require(baseURI .. "playSFX")
 actions["sendDamage"] = require(baseURI .. "sendDamage")
 actions["setAnimation"] = require(baseURI .. "setAnimation")
 actions["wait"] = require(baseURI .. "wait")
+actions["waitFor"] = require(baseURI .. "waitFor")
 actions["waitActorFinished"] = require(baseURI .. "waitActorFinished")
 actions["useItemEffect"] = require(baseURI .. "useItemEffect")
 
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitFor.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitFor.lua
new file mode 100644
index 0000000..9cff58b
--- /dev/null
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/waitFor.lua
@@ -0,0 +1,18 @@
+local StepParent = require "scenes.battlesystem.controllers.fighters.systems.choregraphy.step.parent"
+local WaitForStep = StepParent:extend()
+
+function WaitForStep:new(controller, args)
+  WaitForStep.super.new(self, controller, args)
+end
+
+function WaitForStep:start()
+end
+
+function WaitForStep:update(dt)
+  print(self.arguments.waitFor)
+  if (self.choregraphy:checkCondition(self.arguments.waitFor)) then
+    self:finish()
+  end
+end
+
+return WaitForStep