only zero out units
Merge branch 'customdecimals' into testing