Better spacing, copes with restarts better