Enhanced heuristics