New heuristic and boost speed