Updated for real size cluster + stuff