Improved the Camera system