More waypoint BS