Improved logic for when to stop quivering