Added renumbering option.