Better center waypoints