New heuristics added.