Improved the camera handling