diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs
index d8f8750fe..82e373ace 100644
--- a/Assets/Scripts/Minigames.cs
+++ b/Assets/Scripts/Minigames.cs
@@ -597,7 +597,7 @@ namespace HeavenStudio
                         function: delegate { var e = eventCaller.currentEntity; GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat, e["toggle"]); },
                         parameters: new List<Param>()
                             {
-                            new Param("toggle", true, "Black Flash", "Enable or disable the black screen for this Game Switch")
+                                new Param("toggle", true, "Black Flash", "Enable or disable the black screen for this Game Switch")
                             },
                         inactiveFunction: delegate { var e = eventCaller.currentEntity; GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat, e["toggle"]); }
                     ),
@@ -605,7 +605,7 @@ namespace HeavenStudio
                         function: delegate {
                             Debug.Log("end");
                             if (Timeline.instance != null)
-                                Timeline.instance?.Stop(0);
+                                Timeline.instance?.Stop(Timeline.instance.PlaybackBeat);
                             else
                                 GameManager.instance.Stop(0);
                         }
@@ -615,12 +615,7 @@ namespace HeavenStudio
                         //temp for testing
                         function = delegate {
                             var e = eventCaller.currentEntity;
-                            HeavenStudio.Common.SkillStarManager.instance.DoStarIn(e.beat, e.length); 
-                            // BeatAction.New(HeavenStudio.Common.SkillStarManager.instance.gameObject, new List<BeatAction.Action>(){
-                            //     new BeatAction.Action(e.beat + e.length, delegate {
-                            //         HeavenStudio.Common.SkillStarManager.instance.DoStarJust();
-                            //     })
-                            // });
+                            Common.SkillStarManager.instance.DoStarIn(e.beat, e.length); 
                         }
                     },
                     new GameAction("toggle inputs", "Toggle Inputs", 0.5f, true,
diff --git a/Packages/manifest.json b/Packages/manifest.json
index b7a706181..6e4647290 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
     "com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git",
     "com.rheavenstudio.jukebox": "https://github.com/RHeavenStudio/Jukebox.git?path=/Assets/Scripts/Jukebox",
     "com.tayx.graphy": "https://github.com/Tayx94/graphy.git",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 822140682..2401d0de0 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,5 +1,12 @@
 {
   "dependencies": {
+    "com.cysharp.unitask": {
+      "version": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "cfe509a55602ba5be6df7fa0468b10298b8a053d"
+    },
     "com.nobi.roundedcorners": {
       "version": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git",
       "depth": 0,