Cosmetics
Add intermediate stops