Clustering-stuff added