Changed OneGenListener to NextListener for consistency.