eliminate state.sourceIndividual
add recalc*