CAP-13: Change Numbering Style