Calibration again: somewhat quicker, and should be more precise