final changes for camera