Some modifications to the cluster