Improving the clustering stats