added functional waypoints