improvements to the cluster