lots of new calibration code