Add marks and camera_calibration bit