Added better cluster workings