reverted version back of affinity