Changes to clustering