added awesome new support for waypoints