Added making waypoints on start and end.