improved numbering