Updating some calibration routines