Improved Cluster assignment.