merging ongoing
test for affinity added