nextOrDefault changed to nextOrAdd