add calibration support