added Waypoint system