reduce use of state.sourceIndividual