simplification of the digit building process
merged changes in branch