added calibration tracking