Added functionality to switch heuristics