Added support for numbers greater than 1 character in length