Waypoints updated to 2.0