Calibration improved