Some changes to cluster algo design