Updated clusterizer