More work on heuristic