Improve barycenter heuristic