Rewrote DCM and calibration