Complete renumbering (sorry)