*Added waypoint manager