Now using heuristic rather than F score