Clustering big speed improvement