Merged new camera code