Updated Calculate and Convert to use units