improve numbering