Clustering now works