Improved heuristic a little bit