upated to include waypoints