Changed the camera to separate intrinsic and extrinsic calibration.