Cluster remapping