refactor to further reduce usage of state.sourceIndividual