Implement smooth syncing even when server hopping