Updated to order rows by cluster.