Partial integration of non-consumable without broke the consumables :-)