Add move-sorting to initial step