Added calibration option