added routes & waypoints