Rearrange affinity calls