major changes to cluster