Added Heuristic selection