Remove sort and add look-forward heuristic