use new affiliation calculation method