diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua
index 7b70183..8bdacb2 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addGFX.lua
@@ -2,7 +2,7 @@ local StepParent = require "scenes.battlesystem.controllers.fighters.systems.cho
 local StepGFX = StepParent:extend()
 
 function StepGFX:new(controller, args)
-  StepGFX.super.new(self, controller, args)
+  StepGFX.super.new(self, controller, args, true)
 end
 
 function StepGFX:start()
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addQTE.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addQTE.lua
index a3ed578..47fd1d8 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addQTE.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/addQTE.lua
@@ -2,7 +2,7 @@ local StepParent = require "scenes.battlesystem.controllers.fighters.systems.cho
 local StepQTE = StepParent:extend()
 
 function StepQTE:new(controller, args)
-  StepQTE.super.new(self, controller, args)
+  StepQTE.super.new(self, controller, args, true)
 end
 
 function StepQTE:start()
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo.lua
index a38c982..9bb6433 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/goTo.lua
@@ -2,7 +2,7 @@ local StepParent = require "scenes.battlesystem.controllers.fighters.systems.cho
 local GoToStep = StepParent:extend()
 
 function GoToStep:new(controller, args)
-  GoToStep.super.new(self, controller, args)
+  GoToStep.super.new(self, controller, args, true)
 end
 
 function GoToStep:start()
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jumpBack.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jumpBack.lua
index bb33e2f..94b6afd 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jumpBack.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/jumpBack.lua
@@ -2,7 +2,7 @@ local StepParent = require "scenes.battlesystem.controllers.fighters.systems.cho
 local JumpBackStep = StepParent:extend()
 
 function JumpBackStep:new(controller, args)
-  JumpBackStep.super.new(self, controller, args)
+  JumpBackStep.super.new(self, controller, args, true)
 end
 
 function JumpBackStep:start()
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/parent.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/parent.lua
index 0c204a4..1a9282f 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/parent.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/parent.lua
@@ -1,9 +1,10 @@
 local StepParent = Object:extend()
 
-function StepParent:new(choregraphySystem, arguments)
+function StepParent:new(choregraphySystem, arguments, canBeAsync)
   self.choregraphy = choregraphySystem
   self.arguments = arguments
   self.isStarted = false
+  self.canBeAsync = (canBeAsync == true)
 end
 
 function StepParent:updateStep(dt)
diff --git a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimation.lua b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimation.lua
index b7982f9..406386f 100644
--- a/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimation.lua
+++ b/sonic-radiance.love/scenes/battlesystem/controllers/fighters/systems/choregraphy/step/setAnimation.lua
@@ -2,7 +2,7 @@ local StepParent = require "scenes.battlesystem.controllers.fighters.systems.cho
 local AnimationSetterStep = StepParent:extend()
 
 function AnimationSetterStep:new(controller, args)
-  AnimationSetterStep.super.new(self, controller, args)
+  AnimationSetterStep.super.new(self, controller, args, true)
 end
 
 function AnimationSetterStep:start()