Add heuristics back?