diff --git a/SHADE_Engine/src/Camera/SHCameraSystem.cpp b/SHADE_Engine/src/Camera/SHCameraSystem.cpp
index 921f6f80..bd4252f3 100644
--- a/SHADE_Engine/src/Camera/SHCameraSystem.cpp
+++ b/SHADE_Engine/src/Camera/SHCameraSystem.cpp
@@ -206,6 +206,16 @@ namespace SHADE
         camera->dirtyView = true;
       }
       
+      camera->offset = offset;
+
+      SHVec3 tOffset = pivot.GetTargetOffset();
+
+
+      tOffset = SHVec3::RotateY(tOffset, SHMath::DegreesToRadians(pivot.GetYaw()));
+
+
+      if (pivot.lookAtCameraOrigin)
+        CameraLookAt(*camera, camera->position + pivot.GetTargetOffset());
 
       
 
@@ -250,7 +260,7 @@ namespace SHADE
     if (camera.isActive == false)
       return;
 
-    if (SHComponentManager::HasComponent<SHTransformComponent>(camera.GetEID()) == true && &camera != &editorCamera)
+    if (SHComponentManager::HasComponent<SHTransformComponent>(camera.GetEID()) == true  && SHComponentManager::HasComponent<SHCameraArmComponent>(camera.GetEID()) == false && &camera != &editorCamera)
     {
       auto transform = SHComponentManager::GetComponent<SHTransformComponent>(camera.GetEID());
       SHVec3 rotation = transform->GetWorldRotation();
@@ -273,14 +283,14 @@ namespace SHADE
         {
           camera.offset = arm->GetOffset();
 
-          SHVec3 tOffset = arm->GetTargetOffset();
+          /*SHVec3 tOffset = arm->GetTargetOffset();
 
           
           tOffset = SHVec3::RotateY(tOffset, SHMath::DegreesToRadians(arm->GetYaw()));
 
 
           if (arm->lookAtCameraOrigin)
-            CameraLookAt(camera, camera.position + tOffset);
+            CameraLookAt(camera, camera.position + arm->GetTargetOffset());*/
 
         }