units calculation reworked