More renumbering