Changed library slightly to allow for calibration