New heuristics. Still something to fix.