Added ability to allow digits to be counted