adding affinity back in