added a better mechanism to remove additional shifts as soon as they are converged