Clusters reworked