proper reclustering, tests included