Changes to first heuristic