Progress on calibrate