Renumbered new options so that they do not break too soon.