diff --git a/ThirdPerson/CameraLogic.cs b/ThirdPerson/CameraLogic.cs
index a0ef565..8f26e68 100644
--- a/ThirdPerson/CameraLogic.cs
+++ b/ThirdPerson/CameraLogic.cs
@@ -1,7 +1,6 @@
 using ABI_RC.Core.Player;
 using ABI_RC.Core.Savior;
 using ABI_RC.Core.Util.Object_Behaviour;
-using System.Collections;
 using ABI_RC.Core;
 using ABI.CCK.Components;
 using UnityEngine;
@@ -42,10 +41,8 @@ internal static class CameraLogic
         }
     }
     
-    internal static IEnumerator SetupCamera()
+    internal static void SetupCamera()
     {
-        yield return new WaitUntil(() => PlayerSetup.Instance);
-        
         _thirdPersonCam = new GameObject("ThirdPersonCameraObj", typeof(Camera)).GetComponent<Camera>();
         
         _cameraFovClone = _thirdPersonCam.gameObject.AddComponent<CameraFovClone>();
diff --git a/ThirdPerson/Properties/AssemblyInfo.cs b/ThirdPerson/Properties/AssemblyInfo.cs
index e6254b3..85d8bfa 100644
--- a/ThirdPerson/Properties/AssemblyInfo.cs
+++ b/ThirdPerson/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@ using System.Reflection;
     downloadLink: "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/ThirdPerson"
 )]
 
-[assembly: MelonGame("Alpha Blend Interactive", "ChilloutVR")]
+[assembly: MelonGame("ChilloutVR", "ChilloutVR")]
 [assembly: MelonPlatform(MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
 [assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
 [assembly: MelonColor(255, 246, 25, 97)] // do not change color, originally chosen by Davi
@@ -27,6 +27,6 @@ using System.Reflection;
 namespace NAK.ThirdPerson.Properties;
 internal static class AssemblyInfoParams
 {
-    public const string Version = "1.1.2";
+    public const string Version = "1.1.3";
     public const string Author = "Davi & NotAKidoS";
 }
\ No newline at end of file
diff --git a/ThirdPerson/ThirdPerson.cs b/ThirdPerson/ThirdPerson.cs
index 21691c4..5147e39 100644
--- a/ThirdPerson/ThirdPerson.cs
+++ b/ThirdPerson/ThirdPerson.cs
@@ -1,4 +1,5 @@
-using MelonLoader;
+using ABI_RC.Systems.GameEventSystem;
+using MelonLoader;
 using UnityEngine;
 using static NAK.ThirdPerson.CameraLogic;
 
@@ -13,7 +14,7 @@ public class ThirdPerson : MelonMod
         Logger = LoggerInstance;
         
         Patches.Apply(HarmonyInstance);
-        MelonCoroutines.Start(SetupCamera());
+        CVRGameEventSystem.Initialization.OnPlayerSetupStart.AddListener(SetupCamera);
     }
     
     public override void OnUpdate()