updates to calibration, up to R8