Improved the camera behaviour