A more drastic attempt to get the 10->11 numbering working.