Modify token numbering