Add recalibration logic during loop so it's more robust