updated affinity calculation
updates to modern yote
merging