Updated to new camera class