got the renumbering working
Merge branch 'john'