Heuristics added