Rewrote cluster_core