New calibration handling