changes for granular treatment of affiliations