Added heuristic and step/run selection