Updates to clustering