Clustering updates getting closer to working