Added calibration and removed the DMP.