Sped up update by removing unnecessary computations, updating on cluster deselection