Changes related to calibration