integrate clustering with the recent changes