Added calibration storage and auto-calibration from storage feature