Temp changes to clustering to allow equality comparisons, to be revised further.