Calibration movement improvement