World Update. Waypoints working better.