Made changes so calibration is done once, not repeatedly, but does it for longer