Smarter time management near stop limit