Improve heuristic