Fleshing out calibration