Separating Company's Item Quantity (inhouse) with Customer Item Quantity (non-inhouse) + bug fixes