Enhanced to have same Units for calculation