Attempt to get affiliation detection working