Modified auto-calibration