Improve the speed of the clusterer up to 25 times faster (10s to 0.4s)