Reworking heuristics