#5 added Waypoint