Added calibration flag