Added waypoint system