Updated numbering to includes zeros