Added waypoint and waypoint placement