Make the auto stop smarter