multi-league refactor! :-)