Added calibration functionality