Calibration improved again