Working version, now putting in recalibration