Clustering updated and tested