Affiliations but mostly refactoring