Changed adding units to multiplying by unit type