Updated minor changes to add support for numbers less than 7