2.2.1 : Added option to have "regular" digits by user request