Updated calibration routines