Heuristic rework