Updated Inventory handling on shipping