Updated CameraController