Another try at getting the 10->11 numbering working.