Added possibility for numbers greater than one digit