Change calibration to use normalized time