Revert "Revert "clustering""

This reverts commit f2962588a1d3c137d5ae281066931c17cc9134e0.