further changes to CameraModel