Waypoint design