major changes to calibration