diff --git a/SHADE_Engine/src/Camera/SHCameraSystem.cpp b/SHADE_Engine/src/Camera/SHCameraSystem.cpp
index 3c5cae23..07995fc5 100644
--- a/SHADE_Engine/src/Camera/SHCameraSystem.cpp
+++ b/SHADE_Engine/src/Camera/SHCameraSystem.cpp
@@ -69,6 +69,7 @@ namespace SHADE
 
     if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::A))
     {
+      std::cout << "Camera movement: "<<right.x<<", " << right.y << std::endl;
       camera.position -= right * dt * camera.movementSpeed;
       camera.dirtyView = true;
     }
@@ -109,6 +110,7 @@ namespace SHADE
       camera.dirtyView = true;
     }
 
+    std::cout << "Camera position: " << camera.position.x << " " << camera.position.y << std::endl;
     system->UpdateCameraComponent(system->editorCamera);
 	}
 
@@ -134,14 +136,14 @@ namespace SHADE
 
   void SHCameraSystem::UpdateCameraComponent(SHCameraComponent& camera) noexcept
 	{
-    if (SHComponentManager::HasComponent<SHTransformComponent>(camera.GetEID()) == true)
+    if (SHComponentManager::HasComponent<SHTransformComponent>(camera.GetEID()) == true && &camera != &editorCamera)
     {
       auto transform = SHComponentManager::GetComponent<SHTransformComponent>(camera.GetEID());
       SHVec3 rotation = transform->GetWorldRotation();
       camera.pitch = rotation.x;
       camera.yaw = rotation.y;
       camera.roll = rotation.z;
-      camera.position = transform->GetWorldPosition();
+      camera.position = transform->GetWorldPosition();    
     }
     
 
@@ -151,7 +153,7 @@ namespace SHADE
       SHVec3 view, right, UP;
 
       
-      ClampCameraRotation(camera);
+      //ClampCameraRotation(camera);
 
       GetCameraAxis(camera, view, right, UP);