diff --git a/AntimatterAPI b/AntimatterAPI
index 85b160337..be983fef8 160000
--- a/AntimatterAPI
+++ b/AntimatterAPI
@@ -1 +1 @@
-Subproject commit 85b160337819d82589dbb3c3671e59e926cc0956
+Subproject commit be983fef86413275e030defef8d2d03778002616
diff --git a/common/src/main/java/muramasa/gregtech/GTRemapping.java b/common/src/main/java/muramasa/gregtech/GTRemapping.java
index b993389c5..0805b8061 100644
--- a/common/src/main/java/muramasa/gregtech/GTRemapping.java
+++ b/common/src/main/java/muramasa/gregtech/GTRemapping.java
@@ -23,6 +23,9 @@ public static void init(){
             }
             return r;
         });
+        for (int i = 0; i < 25; i++) {
+            remapGTCore("int_circuit_" + i, "selector_tag_"+i);
+        }
         AntimatterRemapping.remapBlockEntity(new ResourceLocation(Ref.SHARED_ID, "fluid_pipe_polyethylene"), new ResourceLocation(Ref.SHARED_ID, "fluid_pipe_plastic"));
         remap("bath_hv", "bath");
         remap("coke_oven_bronze", "coke_oven");
diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBoiler.java b/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBoiler.java
index 413290735..645418be1 100644
--- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBoiler.java
+++ b/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBoiler.java
@@ -1,6 +1,7 @@
 package muramasa.gregtech.blockentity.multi;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import io.github.gregtechintergalactical.gtcore.item.ItemSelectorTag;
 import muramasa.antimatter.block.BlockBasic;
 import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
 import muramasa.antimatter.capability.machine.MachineRecipeHandler;
@@ -11,14 +12,12 @@
 import muramasa.antimatter.machine.event.IMachineEvent;
 import muramasa.antimatter.machine.event.MachineEvent;
 import muramasa.antimatter.machine.types.Machine;
-import muramasa.antimatter.recipe.IRecipe;
 import muramasa.antimatter.registration.ITextureProvider;
 import muramasa.antimatter.texture.Texture;
 import muramasa.gregtech.GTIRef;
 import muramasa.gregtech.GregTech;
 import muramasa.gregtech.block.BlockCasing;
 import muramasa.gregtech.data.GregTechBlocks;
-import muramasa.gregtech.items.ItemIntCircuit;
 import net.minecraft.client.gui.Font;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -67,7 +66,7 @@ public void checkRecipe() {
                 super.checkRecipe();
                 itemHandler.ifPresent(i -> {
                     ItemStack circuit = i.getHandler(SlotType.STORAGE).getItem(0);
-                    if (circuit.getItem() instanceof ItemIntCircuit intCircuit){
+                    if (circuit.getItem() instanceof ItemSelectorTag intCircuit){
                         if (intCircuit.circuitId > 0 && intCircuit.circuitId <= 24){
                             integratedCircuitConfig = intCircuit.circuitId;
                         }
diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeHeatExchanger.java b/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeHeatExchanger.java
index 746001678..8365633f4 100644
--- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeHeatExchanger.java
+++ b/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeHeatExchanger.java
@@ -1,8 +1,8 @@
 package muramasa.gregtech.blockentity.multi;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import io.github.gregtechintergalactical.gtcore.item.ItemSelectorTag;
 import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
-import muramasa.antimatter.capability.IComponentHandler;
 import muramasa.antimatter.capability.IFilterableHandler;
 import muramasa.antimatter.capability.fluid.FluidTank;
 import muramasa.antimatter.capability.machine.DefaultHeatHandler;
@@ -21,7 +21,6 @@
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.recipe.IRecipe;
 import muramasa.antimatter.util.Utils;
-import muramasa.gregtech.items.ItemIntCircuit;
 import muramasa.gregtech.machine.caps.ParallelRecipeHandler;
 import net.minecraft.client.gui.Font;
 import net.minecraft.core.BlockPos;
@@ -32,8 +31,6 @@
 import tesseract.TesseractGraphWrappers;
 import tesseract.api.heat.IHeatHandler;
 
-import java.util.Optional;
-
 import static muramasa.gregtech.data.Materials.*;
 
 public class BlockEntityLargeHeatExchanger extends BlockEntityMultiMachine<BlockEntityLargeHeatExchanger> implements IFilterableHandler {
@@ -187,7 +184,7 @@ public void serverTick(Level level, BlockPos pos, BlockState state) {
 
     @Override
     public boolean test(SlotType<?> slotType, int slot, ItemStack stack) {
-        if (slotType == SlotType.STORAGE) return stack.getItem() instanceof ItemIntCircuit;
+        if (slotType == SlotType.STORAGE) return stack.getItem() instanceof ItemSelectorTag;
         return true;
     }
 
@@ -195,7 +192,7 @@ public boolean test(SlotType<?> slotType, int slot, ItemStack stack) {
     public void onMachineEvent(IMachineEvent event, Object... data) {
         if (event == SlotType.STORAGE){
             ItemStack circuit = itemHandler.map(i -> i.getHandler(SlotType.STORAGE).getItem(0)).orElse(ItemStack.EMPTY);
-            if (circuit.getItem() instanceof ItemIntCircuit circuit1){
+            if (circuit.getItem() instanceof ItemSelectorTag circuit1){
                 superheatedThreshold = 80000 - (circuit1.circuitId * 3000);
                 efficiency = 1000 - (circuit1.circuitId * 15);
             } else {
diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySmallHeatExchanger.java b/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySmallHeatExchanger.java
index 9c808e46e..2dacdc86f 100644
--- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySmallHeatExchanger.java
+++ b/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySmallHeatExchanger.java
@@ -1,38 +1,19 @@
 package muramasa.gregtech.blockentity.single;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
-import muramasa.antimatter.blockentity.BlockEntityMachine;
-import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine;
-import muramasa.antimatter.capability.IFilterableHandler;
 import muramasa.antimatter.capability.fluid.FluidTank;
 import muramasa.antimatter.capability.machine.DefaultHeatHandler;
 import muramasa.antimatter.capability.machine.MachineFluidHandler;
 import muramasa.antimatter.capability.machine.MachineRecipeHandler;
-import muramasa.antimatter.gui.GuiInstance;
-import muramasa.antimatter.gui.ICanSyncData;
-import muramasa.antimatter.gui.IGuiElement;
-import muramasa.antimatter.gui.SlotType;
-import muramasa.antimatter.gui.widget.InfoRenderWidget;
-import muramasa.antimatter.gui.widget.WidgetSupplier;
-import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer;
-import muramasa.antimatter.machine.event.IMachineEvent;
-import muramasa.antimatter.machine.event.MachineEvent;
 import muramasa.antimatter.machine.types.Machine;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.recipe.IRecipe;
 import muramasa.antimatter.util.Utils;
-import muramasa.gregtech.items.ItemIntCircuit;
-import muramasa.gregtech.machine.caps.ParallelRecipeHandler;
-import net.minecraft.client.gui.Font;
 import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import tesseract.TesseractGraphWrappers;
-import tesseract.api.heat.IHeatHandler;
 
 import static muramasa.antimatter.data.AntimatterMaterials.Water;
 import static muramasa.gregtech.data.Materials.*;
diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
index 5b2986304..6b756109e 100644
--- a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
+++ b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
@@ -1440,7 +1440,7 @@ private static void antimatterMaterials(GregTechMaterialEvent event){
         event.setMaterial(EnderEye).asGemBasic(false, ROD_LONG, PLATE).mats(of(EnderPearl, 1, Blaze, 1));
         event.setMaterial(EnderPearl).mats(of(Beryllium, 1, Potassium, 4, Nitrogen, 5, Chlorine, 6)).elecTicks(220);
         event.setMaterial(Gold).flags(FOIL, ROD_LONG, WIRE_FINE, GEAR);
-        event.setMaterial(Iron).flags(RING, ROD_LONG, GEAR, FRAME);
+        event.setMaterial(Iron).flags(RING, ROD_LONG, GEAR, FRAME, GEAR_SMALL);
         event.setMaterial(Wood).flags(FRAME);
         event.setMaterial(AntimatterMaterials.Netherite).asMetal(2246, 1300, RING);
         event.setMaterial(Lapis).asGemBasic(false, PLATE).mats(of(Lazurite, 12, Sodalite, 2, Pyrite, 1, Calcite, 1));
diff --git a/common/src/main/java/muramasa/gregtech/data/TierMaps.java b/common/src/main/java/muramasa/gregtech/data/TierMaps.java
index dcf493f9f..fc042089c 100644
--- a/common/src/main/java/muramasa/gregtech/data/TierMaps.java
+++ b/common/src/main/java/muramasa/gregtech/data/TierMaps.java
@@ -13,7 +13,6 @@
 import muramasa.antimatter.util.TagUtils;
 import muramasa.gregtech.GTIRef;
 import muramasa.gregtech.GregTechConfig;
-import muramasa.gregtech.items.ItemIntCircuit;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
@@ -25,13 +24,11 @@
 
 import static muramasa.antimatter.data.AntimatterMaterials.Copper;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.GEM;
-import static muramasa.antimatter.data.AntimatterMaterialTypes.ROTOR;
 import static muramasa.antimatter.machine.Tier.*;
 import static muramasa.gregtech.data.Materials.*;
 
 public class TierMaps {
 
-    public static final ImmutableMap<Integer, RecipeIngredient> INT_CIRCUITS;
     public static final ImmutableMap<Tier, Material> TIER_MATERIALS;
     public static final ImmutableMap<Tier, Material> TIER_PIPE_MATERIAL;
     public static ImmutableMap<Tier, PipeItemBlock> TIER_WIRES;
@@ -50,13 +47,6 @@ public class TierMaps {
     public static final TriFunction<PipeSize, Tier, Boolean, Object> CABLE_GETTER;
 
     static {
-        {
-            ImmutableMap.Builder<Integer, RecipeIngredient> builder = ImmutableMap.builder();
-            for (int i = 0; i <= 24; i++) {
-                builder.put(i, RecipeIngredient.of(new ItemIntCircuit(GTIRef.ID, "int_circuit_"+i,i),1).setNoConsume());
-            }
-            INT_CIRCUITS = builder.build();
-        }
         {
             ImmutableMap.Builder<Tier, Material> builder = ImmutableMap.builder();
             builder.put(Tier.ULV, WroughtIron);
diff --git a/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java b/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java
index fa13efb2a..d6f994f10 100644
--- a/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java
+++ b/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java
@@ -4,18 +4,14 @@
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.datagen.providers.AntimatterLanguageProvider;
 import muramasa.antimatter.item.ItemBasic;
-import muramasa.antimatter.machine.Tier;
 import muramasa.antimatter.util.Utils;
 import muramasa.gregtech.GTIRef;
 import muramasa.gregtech.block.*;
 import muramasa.gregtech.data.GregTechBlocks;
 import muramasa.gregtech.data.GregTechItems;
 import muramasa.gregtech.items.ItemDepletedRod;
-import muramasa.gregtech.items.ItemIntCircuit;
 import muramasa.gregtech.items.ItemNuclearFuelRod;
 
-import java.util.Locale;
-
 import static muramasa.antimatter.machine.Tier.*;
 import static muramasa.antimatter.util.Utils.*;
 import static muramasa.gregtech.data.Machines.*;
@@ -351,7 +347,6 @@ protected void english(String domain, String locale) {
                     .replace("Hv", "(HV)")
                     .replace("Ev", "(EV)")
                     .replace("Iv", "(IV)")));
-            AntimatterAPI.all(ItemIntCircuit.class, domain).forEach(i -> override(i.getDescriptionId(), "Integrated Circuit (" + i.circuitId + ")"));
             AntimatterAPI.all(ItemNuclearFuelRod.class, domain).forEach(i -> override(i.getDescriptionId(), Utils.getLocalizedType(i.getMaterial()) + " Fuel Rod"));
             AntimatterAPI.all(ItemDepletedRod.class, domain).forEach(i -> override(i.getDescriptionId(), "Depleted " + Utils.getLocalizedType(i.getMaterial()) + " Fuel Rod"));
             String[] fluids = new String[]{"hot_molten_lithium_chloride", "hot_molten_tin", "hot_molten_sodium"};
diff --git a/common/src/main/java/muramasa/gregtech/integration/AppliedEnergisticsRegistrar.java b/common/src/main/java/muramasa/gregtech/integration/AppliedEnergisticsRegistrar.java
index 4b3235f1b..6a6cd3f48 100644
--- a/common/src/main/java/muramasa/gregtech/integration/AppliedEnergisticsRegistrar.java
+++ b/common/src/main/java/muramasa/gregtech/integration/AppliedEnergisticsRegistrar.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.integration;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.data.AntimatterStoneTypes;
@@ -95,7 +96,7 @@ public static void machineRecipes(){
         RecipeMaps.MACERATOR.RB().ii(of(getAe2Item("sky_stone_chest"))).io(new ItemStack(getAe2Item("sky_dust"), 8)).add("sky_dust_from_chest", 400, 2);
         RecipeMaps.MACERATOR.RB().ii(of(getAe2Item("sky_stone_block"))).io(new ItemStack(getAe2Item("sky_dust"))).add("sky_dust", 400, 2);
         RecipeMaps.ELECTROLYZER.RB().ii(GEM.getMaterialIngredient(CertusQuartz, 1)).io(new ItemStack(getAe2Item("charged_certus_quartz_crystal"))).add("charged_certus_quartz", 2000, 30);
-        E_BLAST_FURNACE.RB().ii(RecipeIngredient.of(TagUtils.getForgelikeItemTag("silicon")), TierMaps.INT_CIRCUITS.get(1)).io(INGOT.get(Silicon)).add("silicon_ingot_from_silicon", 1683, 120, 1683);
+        E_BLAST_FURNACE.RB().ii(RecipeIngredient.of(TagUtils.getForgelikeItemTag("silicon")), GTCoreItems.SELECTOR_TAG_INGREDIENTS.get(1)).io(INGOT.get(Silicon)).add("silicon_ingot_from_silicon", 1683, 120, 1683);
         LASER_ENGRAVER.RB().ii(BLOCK.getMaterialIngredient(Iron, 1), LENS.getMaterialIngredient(GreenSapphire, 1).setNoConsume()).io(new ItemStack(getAe2Item("logic_processor_press"))).add("inscriber_logic_press", 2000, 1920);
         LASER_ENGRAVER.RB().ii(BLOCK.getMaterialIngredient(Iron, 1), LENS.getMaterialIngredient(Opal, 1).setNoConsume()).io(new ItemStack(getAe2Item("calculation_processor_press"))).add("inscriber_calculation_press", 2000, 1920);
         LASER_ENGRAVER.RB().ii(BLOCK.getMaterialIngredient(Iron, 1), LENS.getMaterialIngredient(BlueTopaz, 1).setNoConsume()).io(new ItemStack(getAe2Item("calculation_processor_press"))).add("inscriber_calculation_press_2", 2000, 1920);
diff --git a/common/src/main/java/muramasa/gregtech/items/ItemIntCircuit.java b/common/src/main/java/muramasa/gregtech/items/ItemIntCircuit.java
deleted file mode 100644
index 83ebb0e24..000000000
--- a/common/src/main/java/muramasa/gregtech/items/ItemIntCircuit.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package muramasa.gregtech.items;
-
-import muramasa.antimatter.item.ItemBasic;
-import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of;
-
-import muramasa.antimatter.util.Utils;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResultHolder;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
-
-public class ItemIntCircuit extends ItemBasic<ItemIntCircuit> {
-
-    public final int circuitId;
-
-    public ItemIntCircuit(String domain, String id, int circuitId, Properties properties) {
-        super(domain, id, "int_circuits/", properties);
-        this.circuitId = circuitId;
-    }
-
-    public ItemIntCircuit(String domain, String id,int circuitId) {
-        super(domain, id, "int_circuits/");
-        this.circuitId = circuitId;
-    }
-
-    @Override
-    public String getId() {
-        return super.getId();
-    }
-
-    @Override
-    public InteractionResultHolder<ItemStack> use(Level worldIn, Player playerIn, InteractionHand handIn) {
-        int newId = playerIn.isCrouching() ? this.getNewCircuitIdBackward() : this.getNewCircuitIdForward();
-        ItemStack stack = playerIn.getItemInHand(handIn);
-        ItemStack newStack = new ItemStack(INT_CIRCUITS.get(newId).getItems()[0].getItem(),stack.getCount());
-        playerIn.setItemInHand(handIn, newStack);
-        return InteractionResultHolder.consume(stack);
-    }
-
-    private int getNewCircuitIdForward(){
-        if (this.circuitId == 24){
-            return 0;
-        }
-        return this.circuitId + 1;
-    }
-    private int getNewCircuitIdBackward(){
-        if (this.circuitId == 0){
-            return 24;
-        }
-        return this.circuitId - 1;
-    }
-
-    @Override
-    public void appendHoverText(ItemStack stack, @Nullable Level level, List<Component> tooltipComponents, TooltipFlag isAdvanced) {
-        super.appendHoverText(stack, level, tooltipComponents, isAdvanced);
-        tooltipComponents.add(Utils.translatable("tooltip.gti.int_circuit.0"));
-        tooltipComponents.add(Utils.translatable("tooltip.gti.int_circuit.1"));
-    }
-}
diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
index b313c7be8..dc6e49e8b 100644
--- a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
+++ b/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java
@@ -53,13 +53,8 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
       provider.addStackRecipe(output, GTIRef.ID, "drain_expensive", "parts",
               new ItemStack(GregTech.get(ItemCover.class, "drain"), 1), of('A', PLATES_IRON_ALUMINIUM, 'B', Items.IRON_BARS), "ABA", "B B", "ABA");
 
-    provider.shapeless(output, "int_circuit", "gtparts",
-            INT_CIRCUITS.get(0).getItems()[0], GTCoreTags.CIRCUITS_BASIC);
-    // INT_CIRCUITS.forEach((k, v) -> {
-    Ingredient ing = INT_CIRCUITS.get(0);
-    provider.shapeless(output, "int_circuit_to_circuit", "gtparts",
-        CircuitBasic.getDefaultInstance(), ing);
-    // });
+      provider.addItemRecipe(output, "gtparts", SELECTOR_TAG_ITEMS.get(0),
+              of('G', GEAR_SMALL.getMaterialTag(Iron), 'R', ROD.getMaterialTag(Iron), 'W', WRENCH.getTag(), 'H', HAMMER.getTag()), "GHG", "RRR", "GWG");
 
       provider.shapeless(output, GTIRef.ID, "", "carbon", new ItemStack(CarbonMesh), CarbonFibre, CarbonFibre);
       provider.addItemRecipe(output, GTIRef.ID, "", "carbon", CoalBall,
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java
index d179ca27f..8f0daed08 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java
@@ -109,7 +109,7 @@ private static void casings() {
         addCasing(Lead, GregTechBlocks.CASING_RADIATION_PROOF);
         addCasing(Plastic, GregTechBlocks.CASING_PLASTIC);
         addCasing(BlackBronze, GregTechBlocks.CASING_BLACK_BRONZE);
-        ASSEMBLER.RB().ii(of(GregTechBlocks.CASING_SOLID_STEEL), INT_CIRCUITS.get(6)).fi(Polytetrafluoroethylene.getLiquid(L + (L / 2))).io(GregTechBlocks.CASING_CHEMICALLY_INERT.asItem()).add("chemically_inert_casing", 50, 16);
+        ASSEMBLER.RB().ii(of(GregTechBlocks.CASING_SOLID_STEEL), SELECTOR_TAG_INGREDIENTS.get(6)).fi(Polytetrafluoroethylene.getLiquid(L + (L / 2))).io(GregTechBlocks.CASING_CHEMICALLY_INERT.asItem()).add("chemically_inert_casing", 50, 16);
     }
 
     private static void cables(){
@@ -123,11 +123,11 @@ private static void cables(){
                 int ct = size.getCableThickness();
                 int multiplier = ct == 16 ?  5 : ct == 12 ? 4 : ct == 8 ? 3 : ct == 4 ? 2 : 1;
                 long amount = L * multiplier;
-                ASSEMBLER.RB().ii(of(wireItem,1), INT_CIRCUITS.get(1)).fi(Rubber.getLiquid(amount)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_rubber",size.getCableThickness()* 20L,8);
-                ASSEMBLER.RB().ii(of(wireItem,1), INT_CIRCUITS.get(1)).fi(StyreneButadieneRubber.getLiquid((amount * 3) / 4)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_styrene_butadiene_rubber",100,8);
+                ASSEMBLER.RB().ii(of(wireItem,1), SELECTOR_TAG_INGREDIENTS.get(1)).fi(Rubber.getLiquid(amount)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_rubber",size.getCableThickness()* 20L,8);
+                ASSEMBLER.RB().ii(of(wireItem,1), SELECTOR_TAG_INGREDIENTS.get(1)).fi(StyreneButadieneRubber.getLiquid((amount * 3) / 4)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_styrene_butadiene_rubber",100,8);
                 ASSEMBLER.RB().ii(of(wireItem,1), DUST_SMALL.getMaterialIngredient(PolyvinylChloride, multiplier)).fi(StyreneButadieneRubber.getLiquid(amount / 4)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_styrene_butadiene_rubber_2",100,8);
                 ASSEMBLER.RB().ii(of(wireItem,1), DUST_SMALL.getMaterialIngredient(Polydimethylsiloxane, multiplier)).fi(StyreneButadieneRubber.getLiquid(amount / 4)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_styrene_butadiene_rubber_3",100,8);
-                ASSEMBLER.RB().ii(of(wireItem,1), INT_CIRCUITS.get(1)).fi(SiliconeRubber.getLiquid(amount /2)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_silicone_rubber",100,8);
+                ASSEMBLER.RB().ii(of(wireItem,1), SELECTOR_TAG_INGREDIENTS.get(1)).fi(SiliconeRubber.getLiquid(amount /2)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_silicone_rubber",100,8);
                 ASSEMBLER.RB().ii(of(wireItem,1), DUST_SMALL.getMaterialIngredient(PolyvinylChloride, multiplier)).fi(SiliconeRubber.getLiquid(amount /4)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_silicone_rubber_2",100,8);
                 ASSEMBLER.RB().ii(of(wireItem,1), DUST_SMALL.getMaterialIngredient(Polydimethylsiloxane, multiplier)).fi(SiliconeRubber.getLiquid(amount /4)).io(new ItemStack(cableItem,1)).add("cable_" + t.getMaterial().getId() + "_" + size.getId() + "_silicone_rubber_3",100,8);
             });
@@ -149,7 +149,7 @@ private static void coils(){
     private static void frames(){
         FRAME.all().forEach(m -> {
             MaterialTypeBlock.Container f = FRAME.get().get(m);
-            ASSEMBLER.RB().ii(of(ROD.get(m),4), INT_CIRCUITS.get(4)).io(f.asItem()).add(AntimatterPlatformUtils.getIdFromBlock(f.asBlock()).getPath(),40,24);
+            ASSEMBLER.RB().ii(of(ROD.get(m),4), SELECTOR_TAG_INGREDIENTS.get(4)).io(f.asItem()).add(AntimatterPlatformUtils.getIdFromBlock(f.asBlock()).getPath(),40,24);
         });
     }
 
@@ -158,7 +158,7 @@ private static void misc(){
         ASSEMBLER.RB().ii(of(Machines.TRANSFORMER.getItem(ULV), 8), of(Machines.TRANSFORMER.getItem(LV), 4), of(Machines.TRANSFORMER.getItem(MV), 2),
                 of(Machines.TRANSFORMER.getItem(HV), 1), of(GregTechItems.ComputerMonitor), of(TIER_CIRCUITS.apply(EV), 4)).io(Machines.ADJUSTABLE_TRANSFORMER.getItem(EV)).add("ev_adjustable_transformer", 50, 1920);
         ASSEMBLER.RB().ii(of(Machines.TRANSFORMER.getItem(EV), 1), of(Machines.ADJUSTABLE_TRANSFORMER.getItem(EV), 2), of(GregTechItems.ComputerMonitor), of(TIER_CIRCUITS.apply(IV), 4)).io(Machines.ADJUSTABLE_TRANSFORMER.getItem(IV)).add("iv_adjustable_transformer", 50, 1920);
-        ASSEMBLER.RB().ii(of(ItemTags.PLANKS,8), INT_CIRCUITS.get(8)).io(new ItemStack(Items.CHEST,1)).add("chest",100,4);
+        ASSEMBLER.RB().ii(of(ItemTags.PLANKS,8), SELECTOR_TAG_INGREDIENTS.get(8)).io(new ItemStack(Items.CHEST,1)).add("chest",100,4);
 
         ASSEMBLER.RB().ii(of(GregTechItems.EmitterMV), PLATE.getMaterialIngredient(Aluminium, 1)).io(GregTechCovers.COVER_NEEDS_MAINTENANCE_COVER.getItem()).add("needs_maintenance_cover", 600, 24);
         ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 2), of(Items.IRON_BARS, 2)).io(GregTechCovers.COVER_DRAIN.getItem()).add("drain",800, 16);
@@ -167,11 +167,11 @@ private static void misc(){
         addCoverRecipe(GregTechCovers.COVER_ENERGY_DETECTOR.getItem(), of(PLATES_IRON_ALUMINIUM, 1), of(CIRCUITS_BASIC, 1));
         addCoverRecipe(GregTechCovers.COVER_FLUID_DETECTOR.getItem(), of(PLATES_IRON_ALUMINIUM, 1), of(Items.HEAVY_WEIGHTED_PRESSURE_PLATE, 1));
         addCoverRecipe(GregTechCovers.COVER_ITEM_DETECTOR.getItem(), of(PLATES_IRON_ALUMINIUM, 1), of(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, 1));
-        ASSEMBLER.RB().ii(of(CarbonFibre, 2), INT_CIRCUITS.get(2)).io(CarbonMesh).add("carbon_mesh", 800, 2);
-        ASSEMBLER.RB().ii(of(CarbonFibre, 4), FOIL.getMaterialIngredient(Zinc, 16), INT_CIRCUITS.get(0)).io(GregTechCovers.COVER_ITEM_FILTER.getItem()).add("item_filter", 1600, 32);
-        ASSEMBLER.RB().ii(WIRE_FINE.getMaterialIngredient(Steel, 64), FOIL.getMaterialIngredient(Zinc, 16), INT_CIRCUITS.get(0)).io(GregTechCovers.COVER_ITEM_FILTER.getItem()).add("item_filter_cheap", 1600, 32);
-        ASSEMBLER.RB().ii(of(CarbonFibre, 4), FOIL.getMaterialIngredient(Zinc, 16), INT_CIRCUITS.get(1)).io(GregTechCovers.COVER_FLUID_FILTER.getItem()).add("fluid_filter", 1600, 32);
-        ASSEMBLER.RB().ii(WIRE_FINE.getMaterialIngredient(Steel, 64), FOIL.getMaterialIngredient(Zinc, 16), INT_CIRCUITS.get(1)).io(GregTechCovers.COVER_FLUID_FILTER.getItem()).add("fluid_filter_cheap", 1600, 32);
+        ASSEMBLER.RB().ii(of(CarbonFibre, 2), SELECTOR_TAG_INGREDIENTS.get(2)).io(CarbonMesh).add("carbon_mesh", 800, 2);
+        ASSEMBLER.RB().ii(of(CarbonFibre, 4), FOIL.getMaterialIngredient(Zinc, 16), SELECTOR_TAG_INGREDIENTS.get(0)).io(GregTechCovers.COVER_ITEM_FILTER.getItem()).add("item_filter", 1600, 32);
+        ASSEMBLER.RB().ii(WIRE_FINE.getMaterialIngredient(Steel, 64), FOIL.getMaterialIngredient(Zinc, 16), SELECTOR_TAG_INGREDIENTS.get(0)).io(GregTechCovers.COVER_ITEM_FILTER.getItem()).add("item_filter_cheap", 1600, 32);
+        ASSEMBLER.RB().ii(of(CarbonFibre, 4), FOIL.getMaterialIngredient(Zinc, 16), SELECTOR_TAG_INGREDIENTS.get(1)).io(GregTechCovers.COVER_FLUID_FILTER.getItem()).add("fluid_filter", 1600, 32);
+        ASSEMBLER.RB().ii(WIRE_FINE.getMaterialIngredient(Steel, 64), FOIL.getMaterialIngredient(Zinc, 16), SELECTOR_TAG_INGREDIENTS.get(1)).io(GregTechCovers.COVER_FLUID_FILTER.getItem()).add("fluid_filter_cheap", 1600, 32);
         ASSEMBLER.RB().ii(of(PLATES_IRON_ALUMINIUM, 2), of(Items.IRON_TRAPDOOR)).io(new ItemStack(GregTechCovers.COVER_SHUTTER.getItem().getItem(), 2)).add("shutter",800, 16);
         ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(Invar, 2), of(Items.FLINT, 1)).io(GTCoreItems.LighterEmpty).add("empty_lighter", 256, 16);
         ASSEMBLER.RB().ii(of(Match, 64), of(Items.PAPER, 2)).fi(Glue.getLiquid(10)).io(MatchBook).add("matchbook", 100, 16);
@@ -247,7 +247,7 @@ private static void turbines(){
     }
 
     private static void addTierCasing (Tier tier) {
-        ASSEMBLER.RB().ii(of(PLATE.getMaterialTag(TIER_MATERIALS.get(tier)), 8), INT_CIRCUITS.get(8)).io(new ItemStack(AntimatterAPI.get(BlockCasing.class, "casing_" + tier.getId(), GTIRef.ID))).add("casing_" + tier.getId(),50, 16);
+        ASSEMBLER.RB().ii(of(PLATE.getMaterialTag(TIER_MATERIALS.get(tier)), 8), SELECTOR_TAG_INGREDIENTS.get(8)).io(new ItemStack(AntimatterAPI.get(BlockCasing.class, "casing_" + tier.getId(), GTIRef.ID))).add("casing_" + tier.getId(),50, 16);
     }
 
     private static void addTierHull(Tier tier) {
@@ -261,10 +261,10 @@ private static void addCasing (Material mat, BlockCasing casing) {
     }
 
     private static void addWall(Material mat, BlockColoredWall casing) {
-        ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(mat, 4), INT_CIRCUITS.get(24)).io(new ItemStack(casing,1)).add(AntimatterPlatformUtils.getIdFromBlock(casing).getPath(),80, 30);
+        ASSEMBLER.RB().ii(PLATE.getMaterialIngredient(mat, 4), SELECTOR_TAG_INGREDIENTS.get(24)).io(new ItemStack(casing,1)).add(AntimatterPlatformUtils.getIdFromBlock(casing).getPath(),80, 30);
     }
 
     private static void addCoil (BlockCoil coil, PipeItemBlock wire) {
-        ASSEMBLER.RB().ii(of(wire,8), INT_CIRCUITS.get(8)).io(new ItemStack(coil,1)).add(AntimatterPlatformUtils.getIdFromBlock(coil).getPath(), 100, 30);
+        ASSEMBLER.RB().ii(of(wire,8), SELECTOR_TAG_INGREDIENTS.get(8)).io(new ItemStack(coil,1)).add(AntimatterPlatformUtils.getIdFromBlock(coil).getPath(), 100, 30);
     }
 }
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/BenderLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/BenderLoader.java
index 6fc87a62c..d143f7ec4 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/BenderLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/BenderLoader.java
@@ -12,8 +12,8 @@
 
 import java.util.function.ToLongFunction;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
 import static muramasa.gregtech.data.RecipeMaps.BENDER;
 
 public class BenderLoader {
@@ -24,28 +24,28 @@ public static void init() {
         };
         PLATE.all().forEach(t -> {
             if (!t.has(AntimatterMaterialTypes.INGOT) || t.has(MaterialTags.RUBBERTOOLS)) return;
-            BENDER.RB().ii(AntimatterMaterialTypes.INGOT.getMaterialIngredient(t,1),INT_CIRCUITS.get(1)).io(PLATE.get(t,1)).add("plate_" + t.getId(), baseDuration.applyAsLong(t), 24);
+            BENDER.RB().ii(AntimatterMaterialTypes.INGOT.getMaterialIngredient(t,1),SELECTOR_TAG_INGREDIENTS.get(1)).io(PLATE.get(t,1)).add("plate_" + t.getId(), baseDuration.applyAsLong(t), 24);
         });
         PLATE_DENSE.all().forEach(t -> {
             if (t.has(MaterialTags.RUBBERTOOLS)) return;
             if (t.has(AntimatterMaterialTypes.INGOT)) {
-                BENDER.RB().ii(AntimatterMaterialTypes.INGOT.getMaterialIngredient(t,9),INT_CIRCUITS.get(9)).io(PLATE_DENSE.get(t,1)).add("plate_dense_" + t.getId(), baseDuration.applyAsLong(t) * 9, 96);
+                BENDER.RB().ii(AntimatterMaterialTypes.INGOT.getMaterialIngredient(t,9),SELECTOR_TAG_INGREDIENTS.get(9)).io(PLATE_DENSE.get(t,1)).add("plate_dense_" + t.getId(), baseDuration.applyAsLong(t) * 9, 96);
             }
         });
         AntimatterMaterialTypes.FOIL.all().forEach(foil -> {
             if (!foil.has(PLATE) || foil.has(MaterialTags.RUBBERTOOLS)) return;
-            BENDER.RB().ii(PLATE.getMaterialIngredient(foil,1), INT_CIRCUITS.get(1)).io(AntimatterMaterialTypes.FOIL.get(foil,4)).add("foil_" + foil.getId(), baseDuration.applyAsLong(foil),24);
+            BENDER.RB().ii(PLATE.getMaterialIngredient(foil,1), SELECTOR_TAG_INGREDIENTS.get(1)).io(AntimatterMaterialTypes.FOIL.get(foil,4)).add("foil_" + foil.getId(), baseDuration.applyAsLong(foil),24);
         });
         AntimatterMaterialTypes.SPRING.all().stream().filter(m -> !m.has(MaterialTags.RUBBERTOOLS)).forEach(spring -> {
-            BENDER.RB().ii(ROD_LONG.getMaterialIngredient(spring, 1), INT_CIRCUITS.get(1)).io(SPRING.get(spring)).add(spring.getId() + "_spring", 200, 16);
+            BENDER.RB().ii(ROD_LONG.getMaterialIngredient(spring, 1), SELECTOR_TAG_INGREDIENTS.get(1)).io(SPRING.get(spring)).add(spring.getId() + "_spring", 200, 16);
         });
         RING.all().stream().filter(m -> !m.has(MaterialTags.RUBBERTOOLS)).forEach(ring -> {
-            BENDER.RB().ii(ROD.getMaterialIngredient(ring, 1), INT_CIRCUITS.get(1)).io(RING.get(ring, 2)).add(ring.getId() + "_ring", 200, 16);
+            BENDER.RB().ii(ROD.getMaterialIngredient(ring, 1), SELECTOR_TAG_INGREDIENTS.get(1)).io(RING.get(ring, 2)).add(ring.getId() + "_ring", 200, 16);
         });
-        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.Tin,2), INT_CIRCUITS.get(4)).io(GregTechItems.CellTin.getDefaultInstance()).add("tin_cell",80,24);
-        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.Steel,2), INT_CIRCUITS.get(4)).io(GregTechItems.CellSteel.getDefaultInstance()).add("steel_cell",80,96);
-        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.TungstenSteel,2), INT_CIRCUITS.get(4)).io(GregTechItems.CellTungstensteel.getDefaultInstance()).add("tungstensteel_cell",80,384);
-        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.Zirconium,1), INT_CIRCUITS.get(1)).io(GregTechItems.EmptyNuclearFuelRod).add("empty_fuel_rod",80,96);
-        BENDER.RB().ii(PLATE.getMaterialIngredient(AntimatterMaterials.Iron, 3), INT_CIRCUITS.get(3)).io(new ItemStack(Items.BUCKET)).add("bucket", 200, 16);
+        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.Tin,2), SELECTOR_TAG_INGREDIENTS.get(4)).io(GregTechItems.CellTin.getDefaultInstance()).add("tin_cell",80,24);
+        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.Steel,2), SELECTOR_TAG_INGREDIENTS.get(4)).io(GregTechItems.CellSteel.getDefaultInstance()).add("steel_cell",80,96);
+        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.TungstenSteel,2), SELECTOR_TAG_INGREDIENTS.get(4)).io(GregTechItems.CellTungstensteel.getDefaultInstance()).add("tungstensteel_cell",80,384);
+        BENDER.RB().ii(PLATE.getMaterialIngredient(Materials.Zirconium,1), SELECTOR_TAG_INGREDIENTS.get(1)).io(GregTechItems.EmptyNuclearFuelRod).add("empty_fuel_rod",80,96);
+        BENDER.RB().ii(PLATE.getMaterialIngredient(AntimatterMaterials.Iron, 3), SELECTOR_TAG_INGREDIENTS.get(3)).io(new ItemStack(Items.BUCKET)).add("bucket", 200, 16);
     }
 }
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java
index ad1f0abb4..89dc1fec0 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java
@@ -10,13 +10,13 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS;
 import static muramasa.antimatter.Ref.L;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of;
 import static muramasa.gregtech.data.Materials.*;
 import static muramasa.gregtech.data.RecipeMaps.CHEMICAL_REACTOR;
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
 
 public class ChemicalReactorLoader {
 
@@ -41,10 +41,10 @@ private static void addShared(){
         //CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(7000),VinylChloride.getGas(1000)).fo(PolyvinylChloride.getLiquid(1500)).add("vinylchloride_to_polyvinylchloride_1",1120, 30);
         //POLYTETRAFLUOROETHYLENE
         CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(1000),Tetrafluoroethylene.getGas(144)).fo(Polytetrafluoroethylene.getLiquid(216)).add("tetrafluoroethylene_to_polytetrafluoroethylene",160, 30);
-        //CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(7000),Tetrafluoroethylene.getGas(1000)).ii(INT_CIRCUITS.get(2)).fo(Polytetrafluoroethylene.getLiquid(1500)).add("tetrafluoroethylene_to_polytetrafluoroethylene_1",1120, 30);
+        //CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(7000),Tetrafluoroethylene.getGas(1000)).ii(SELECTOR_TAG_INGREDIENTS.get(2)).fo(Polytetrafluoroethylene.getLiquid(1500)).add("tetrafluoroethylene_to_polytetrafluoroethylene_1",1120, 30);
         CHEMICAL_REACTOR.RB().fi(Naphtha.getLiquid(3000),Fluorine.getGas(1000),Epichlorohydrin.getLiquid(432)).fo(Polytetrafluoroethylene.getLiquid(432)).add("tetrafluoroethylene_to_polytetrafluoroethylene_2",240, 256);
         //POLYSTYRENE
-        //CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(1000),Styrene.getLiquid(144)).ii(INT_CIRCUITS.get(1)).fo(Polystyrene.getLiquid(216)).add("styrene_to_polystyrene",160, 30);
+        //CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(1000),Styrene.getLiquid(144)).ii(SELECTOR_TAG_INGREDIENTS.get(1)).fo(Polystyrene.getLiquid(216)).add("styrene_to_polystyrene",160, 30);
         //TETRAFLUOROETHYLENE
         CHEMICAL_REACTOR.RB().fi(Fluorine.getGas(2000),Ethylene.getGas(1000)).fo(Tetrafluoroethylene.getGas(3000)).add("ethylene_to_tetrafluoroethylene",180, 180);
         //EPICHLOROHYDRIN
@@ -87,7 +87,7 @@ private static void addShared(){
         //ETHYLENE
         CHEMICAL_REACTOR.RB().fi(SulfuricAcid.getLiquid(2000), Ethanol.getLiquid(3000)).fo(Ethylene.getGas(2000), DilutedSulfuricAcid.getLiquid(3000)).add("ethylene_2",400, 120);
         //ACETIC ACID
-        CHEMICAL_REACTOR.RB().ii(INT_CIRCUITS.get(9)).fi(Oxygen.getGas(1000), Ethylene.getGas(3000)).fo(AceticAcid.getLiquid(4000)).add("acetic_acid",50, 30);
+        CHEMICAL_REACTOR.RB().ii(SELECTOR_TAG_INGREDIENTS.get(9)).fi(Oxygen.getGas(1000), Ethylene.getGas(3000)).fo(AceticAcid.getLiquid(4000)).add("acetic_acid",50, 30);
         CHEMICAL_REACTOR.RB().fi(CarbonMonoxide.getGas(1000), Methanol.getLiquid(3000)).fo(AceticAcid.getLiquid(4000)).add("acetic_acid_1",150, 30);
         CHEMICAL_REACTOR.RB().fi(CarbonMonoxide.getGas(1000), Hydrogen.getGas(1000)).fo(AceticAcid.getLiquid(2000)).add("acetic_acid_2",80, 30);
         //METHANOL
@@ -167,9 +167,9 @@ private static void addComplicated(){
         CHEMICAL_REACTOR.RB().fi(Oxygen.getGas(500), Ethylene.getGas(3000), AceticAcid.getLiquid(4000)).fo(VinylAcetate.getLiquid(6000)).add("vinyl_acetate", 90, 30, -1);
         addPolymerRecipe(VinylAcetate, PolyvinylAcetate);
         //CHLOROFORM
-        CHEMICAL_REACTOR.RB().fi(Methane.getGas(6000), Chlorine.getGas(5000)).ii(INT_CIRCUITS.get(13)).fo(HydrochloricAcid.getLiquid(6000), Chloroform.getLiquid(5000)).add("hydrochloric_acid_1", 16, 30, -1);
+        CHEMICAL_REACTOR.RB().fi(Methane.getGas(6000), Chlorine.getGas(5000)).ii(SELECTOR_TAG_INGREDIENTS.get(13)).fo(HydrochloricAcid.getLiquid(6000), Chloroform.getLiquid(5000)).add("hydrochloric_acid_1", 16, 30, -1);
         //CHLOROBENZENE
-        CHEMICAL_REACTOR.RB().fi(Chlorine.getGas(1000), Benzene.getLiquid(6000)).ii(INT_CIRCUITS.get(4)).fo(Chlorobenzene.getLiquid(6000), HydrochloricAcid.getLiquid(1000)).add("chlorobenzene", 120, 30, -1);
+        CHEMICAL_REACTOR.RB().fi(Chlorine.getGas(1000), Benzene.getLiquid(6000)).ii(SELECTOR_TAG_INGREDIENTS.get(4)).fo(Chlorobenzene.getLiquid(6000), HydrochloricAcid.getLiquid(1000)).add("chlorobenzene", 120, 30, -1);
         //HYPOCHLOROUS ACID
         CHEMICAL_REACTOR.RB().fi(Chlorine.getGas(1000), Water.getLiquid(1000)).fo(HydrochloricAcid.getLiquid(1000), HypochlorousAcid.getLiquid(1000)).add("hypochlorous_acid", 60, 30, -1);
         //EPICHLOROHYDRIN
@@ -194,7 +194,7 @@ private static void addComplicated(){
         //EPOXY RESIN
         CHEMICAL_REACTOR.RB().fi(BisphenolA.getLiquid(12000), Epichlorohydrin.getLiquid(4000)).ii(DUST.getMaterialIngredient(SodiumHydroxide, 1)).fo(EpoxyResin.getLiquid(16000), SaltWater.getLiquid(1000)).add("complicated_epoxy_resin", 200, 30, -1);
         //CHLOROMETHANE
-        CHEMICAL_REACTOR.RB().fi(Chlorine.getGas(2000), Methane.getGas(5000)).ii(INT_CIRCUITS.get(1)).fo(Chloromethane.getGas(5000), HydrochloricAcid.getLiquid(2000)).add("chloromethane", 80, 30, -1);
+        CHEMICAL_REACTOR.RB().fi(Chlorine.getGas(2000), Methane.getGas(5000)).ii(SELECTOR_TAG_INGREDIENTS.get(1)).fo(Chloromethane.getGas(5000), HydrochloricAcid.getLiquid(2000)).add("chloromethane", 80, 30, -1);
         CHEMICAL_REACTOR.RB().fi(Methanol.getLiquid(6000), HydrochloricAcid.getLiquid(2000)).fo(Chloromethane.getGas(5000), Water.getLiquid(3000)).add("chloromethane_1",160, 30, -1);
         //ALLYL CHLORIDE
         CHEMICAL_REACTOR.RB().fi(Propene.getGas(9000), Chlorine.getGas(2000)).fo(AllylChloride.getLiquid(9000), HydrochloricAcid.getLiquid(2000)).add("hydrochloric_acid_5", 160, 30, -1);
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/DistilleryLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/DistilleryLoader.java
index 504655483..cd96b7a31 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/DistilleryLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/DistilleryLoader.java
@@ -6,7 +6,6 @@
 
 import static muramasa.antimatter.material.MaterialTags.*;
 import static muramasa.gregtech.data.RecipeMaps.*;
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
 
 public class DistilleryLoader {
     public static void init() {
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java
index 24f8f179e..eecbf8b32 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java
@@ -1,6 +1,7 @@
 package muramasa.gregtech.loader.machines;
 
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.material.MaterialTags;
@@ -17,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS;
 import static muramasa.antimatter.Ref.L;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
@@ -50,7 +52,7 @@ public static void init() {
                 b.fi(t.getFluidIngredient(inputAmount * 1000));
             }
             if (t.has(ELEC_CIRCUIT)){
-                b.ii(TierMaps.INT_CIRCUITS.get(1));
+                b.ii(SELECTOR_TAG_INGREDIENTS.get(1));
             }
             long duration = t.has(ELEC_TICKS) ? ELEC_TICKS.getInt(t) : t.getMass() * 20;
             b.io(items).fo(fluids).add(prefix + "_" + t.getId(),duration, euPerTick);
@@ -84,16 +86,16 @@ public static void init() {
             addVitriolRecipe(CyanVitriol, Nickel);
             addVitriolRecipe(WhiteVitriol, Zinc);
             addVitriolRecipe(GrayVitriol, Manganese);
-            ELECTROLYZER.RB().fi(Water.getLiquid(900), VitriolOfClay.getLiquid(1700)).ii(TierMaps.INT_CIRCUITS.get(1)).io(DUST_SMALL.get(Alumina, 2)).fo(SulfuricAcid.getLiquid(2100)).add("vitriol_of_clay_to_alumina", 19, 64);
-            ELECTROLYZER.RB().fi(DistilledWater.getLiquid(900), VitriolOfClay.getLiquid(1700)).ii(TierMaps.INT_CIRCUITS.get(1)).io(DUST_SMALL.get(Alumina, 2)).fo(SulfuricAcid.getLiquid(2100)).add("vitriol_of_clay_to_alumina_distilled", 19, 64);
-            ELECTROLYZER.RB().fi(Water.getLiquid(6000), ChloroplatinicAcid.getLiquid(9000)).ii(TierMaps.INT_CIRCUITS.get(2)).io(DUST.get(Platinum)).fo(HydrochloricAcid.getLiquid(12000), Oxygen.getGas(2000)).add("chloroplatinic_acid", 96, 64);
-            ELECTROLYZER.RB().fi(DistilledWater.getLiquid(6000), ChloroplatinicAcid.getLiquid(9000)).ii(TierMaps.INT_CIRCUITS.get(2)).io(DUST.get(Platinum)).fo(HydrochloricAcid.getLiquid(12000), Oxygen.getGas(2000)).add("chloroplatinic_acid_distilled", 96, 64);
+            ELECTROLYZER.RB().fi(Water.getLiquid(900), VitriolOfClay.getLiquid(1700)).ii(SELECTOR_TAG_INGREDIENTS.get(1)).io(DUST_SMALL.get(Alumina, 2)).fo(SulfuricAcid.getLiquid(2100)).add("vitriol_of_clay_to_alumina", 19, 64);
+            ELECTROLYZER.RB().fi(DistilledWater.getLiquid(900), VitriolOfClay.getLiquid(1700)).ii(SELECTOR_TAG_INGREDIENTS.get(1)).io(DUST_SMALL.get(Alumina, 2)).fo(SulfuricAcid.getLiquid(2100)).add("vitriol_of_clay_to_alumina_distilled", 19, 64);
+            ELECTROLYZER.RB().fi(Water.getLiquid(6000), ChloroplatinicAcid.getLiquid(9000)).ii(SELECTOR_TAG_INGREDIENTS.get(2)).io(DUST.get(Platinum)).fo(HydrochloricAcid.getLiquid(12000), Oxygen.getGas(2000)).add("chloroplatinic_acid", 96, 64);
+            ELECTROLYZER.RB().fi(DistilledWater.getLiquid(6000), ChloroplatinicAcid.getLiquid(9000)).ii(SELECTOR_TAG_INGREDIENTS.get(2)).io(DUST.get(Platinum)).fo(HydrochloricAcid.getLiquid(12000), Oxygen.getGas(2000)).add("chloroplatinic_acid_distilled", 96, 64);
         }
     }
 
     private static void addVitriolRecipe(Material vitriol, Material dust){
-        ELECTROLYZER.RB().fi(vitriol.getLiquid(6000), Water.getLiquid(3000)).ii(TierMaps.INT_CIRCUITS.get(2)).io(DUST.get(dust)).fo(SulfuricAcid.getLiquid(7000), Oxygen.getGas(1000)).add(vitriol.getId() + "_to_" + dust.getId(), 64, 64);
-        ELECTROLYZER.RB().fi(vitriol.getLiquid(6000), DistilledWater.getLiquid(3000)).ii(TierMaps.INT_CIRCUITS.get(2)).io(DUST.get(dust)).fo(SulfuricAcid.getLiquid(7000), Oxygen.getGas(1000)).add(vitriol.getId() + "_to_" + dust.getId() + "_distilled", 64, 64);
+        ELECTROLYZER.RB().fi(vitriol.getLiquid(6000), Water.getLiquid(3000)).ii(SELECTOR_TAG_INGREDIENTS.get(2)).io(DUST.get(dust)).fo(SulfuricAcid.getLiquid(7000), Oxygen.getGas(1000)).add(vitriol.getId() + "_to_" + dust.getId(), 64, 64);
+        ELECTROLYZER.RB().fi(vitriol.getLiquid(6000), DistilledWater.getLiquid(3000)).ii(SELECTOR_TAG_INGREDIENTS.get(2)).io(DUST.get(dust)).fo(SulfuricAcid.getLiquid(7000), Oxygen.getGas(1000)).add(vitriol.getId() + "_to_" + dust.getId() + "_distilled", 64, 64);
     }
 
 }
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/UUMatterLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/UUMatterLoader.java
index 3c2638482..ad7f63ecf 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/UUMatterLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/UUMatterLoader.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.material.Material;
@@ -10,12 +11,11 @@
 
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.gregtech.data.Materials.UUAmplifier;
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
 
 public class UUMatterLoader {
     public static void init(){
         RecipeMaps.MASS_FABRICATOR.RB().fi(UUAmplifier.getLiquid(1)).fo(Materials.UUMatter.getLiquid(1)).add("uu_matter", 803, 256);
-        RecipeMaps.MASS_FABRICATOR.RB().ii(INT_CIRCUITS.get(0)).fo(Materials.UUMatter.getLiquid(1)).add("uu_matter_expensive", 3215, 256);
+        RecipeMaps.MASS_FABRICATOR.RB().ii(GTCoreItems.SELECTOR_TAG_INGREDIENTS.get(0)).fo(Materials.UUMatter.getLiquid(1)).add("uu_matter_expensive", 3215, 256);
         AntimatterAPI.all(Material.class).stream().filter(m -> m.getElement() != null && (m.has(DUST) || m.has(LIQUID) || m.has(GAS))).forEach(m -> {
             RecipeBuilder b = RecipeMaps.AMP_FABRICATOR.RB();
             if (m.has(AntimatterMaterialTypes.DUST)){
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/UnpackagerLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/UnpackagerLoader.java
index 7c00e26e8..de9d5dbf8 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/UnpackagerLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/UnpackagerLoader.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.loader.machines;
 
+import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.material.Material;
 import muramasa.gregtech.data.TierMaps;
@@ -11,10 +12,10 @@ public class UnpackagerLoader {
     public static void init() {
         for (Material material : DUST.all()) {
             if (material.has(DUST_TINY)) {
-                UNPACKAGER.RB().ii(DUST.getMaterialIngredient(material, 1), TierMaps.INT_CIRCUITS.get(9)).io(DUST_TINY.get(material, 9)).add("dust_tiny_" + material.getId(),100, 2);
+                UNPACKAGER.RB().ii(DUST.getMaterialIngredient(material, 1), GTCoreItems.SELECTOR_TAG_INGREDIENTS.get(9)).io(DUST_TINY.get(material, 9)).add("dust_tiny_" + material.getId(),100, 2);
             }
             if (material.has(DUST_SMALL)) {
-                UNPACKAGER.RB().ii(DUST.getMaterialIngredient(material, 1), TierMaps.INT_CIRCUITS.get(4)).io(DUST_SMALL.get(material, 4)).add("dust_small_" + material.getId(),100, 2);
+                UNPACKAGER.RB().ii(DUST.getMaterialIngredient(material, 1), GTCoreItems.SELECTOR_TAG_INGREDIENTS.get(4)).io(DUST_SMALL.get(material, 4)).add("dust_small_" + material.getId(),100, 2);
             }
         }
 
diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/BlastFurnaceLoader.java b/common/src/main/java/muramasa/gregtech/loader/multi/BlastFurnaceLoader.java
index c1003d737..6b9a08fbc 100644
--- a/common/src/main/java/muramasa/gregtech/loader/multi/BlastFurnaceLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/multi/BlastFurnaceLoader.java
@@ -10,12 +10,12 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS;
 import static muramasa.antimatter.data.AntimatterMaterials.Copper;
 import static muramasa.antimatter.data.AntimatterMaterials.Iron;
 import static muramasa.antimatter.material.MaterialTags.*;
 import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
 import static muramasa.gregtech.data.Materials.*;
 import static muramasa.gregtech.data.RecipeMaps.PRIMITIVE_BLAST_FURNACE;
 import static muramasa.gregtech.data.RecipeMaps.E_BLAST_FURNACE;
@@ -30,7 +30,7 @@ public static void init() {
             if (m.has(GregTechMaterialTags.NEEDS_BLAST_FURNACE) && m.has(GregTechMaterialTags.BLAST_FURNACE_TEMP)){
                 ItemStack ingot = DIRECT_SMELT_INTO.getMapping(m).has(INGOT_HOT) ? INGOT_HOT.get(DIRECT_SMELT_INTO.getMapping(m), 1) : INGOT.get(DIRECT_SMELT_INTO.getMapping(m), 1);
                 int heat = GregTechMaterialTags.BLAST_FURNACE_TEMP.getInt(m);
-                E_BLAST_FURNACE.RB().temperature(heat).ii(DUST.getMaterialIngredient(m, 1), INT_CIRCUITS.get(1)).io(ingot).add(DIRECT_SMELT_INTO.getMapping(m).getId() + "_ingot_from_" + m.getId() + "_dust", Math.max(m.getMass() / 40L, 1L) * heat, 120);
+                E_BLAST_FURNACE.RB().temperature(heat).ii(DUST.getMaterialIngredient(m, 1), SELECTOR_TAG_INGREDIENTS.get(1)).io(ingot).add(DIRECT_SMELT_INTO.getMapping(m).getId() + "_ingot_from_" + m.getId() + "_dust", Math.max(m.getMass() / 40L, 1L) * heat, 120);
             }
         });
 
@@ -77,7 +77,7 @@ public static void init() {
                     .io(NUGGET.get(Aluminium, 3), DUST_TINY.get(DarkAsh, 1))
                     .add("aluminium_ingot_from_green_sapphire", 400, 100);
             int heat = GregTechMaterialTags.BLAST_FURNACE_TEMP.getInt(Aluminium);
-            E_BLAST_FURNACE.RB().temperature(1700).ii(DUST.getMaterialIngredient(Aluminium, 1), INT_CIRCUITS.get(1)).io(INGOT.get(Aluminium)).add( "aluminium_ingot_from_aluminium_dust", Math.max(Aluminium.getMass() / 40L, 1L) * heat, 120);
+            E_BLAST_FURNACE.RB().temperature(1700).ii(DUST.getMaterialIngredient(Aluminium, 1), SELECTOR_TAG_INGREDIENTS.get(1)).io(INGOT.get(Aluminium)).add( "aluminium_ingot_from_aluminium_dust", Math.max(Aluminium.getMass() / 40L, 1L) * heat, 120);
             E_BLAST_FURNACE.RB().temperature(1700).ii(DUST.getMaterialIngredient(Alumina, 4), of(1, DUST.getMaterialTag(Calcite), DUST.getMaterialTag(Limestone), DUST.getMaterialTag(Marble))).io(INGOT.get(Aluminium)).add("alumina", 4 * 100, 120);
         }
 
@@ -97,7 +97,7 @@ public static void init() {
         /* Kanthal*/
         addBlastAlloyRecipes(Kanthal, 3, 1800, 120, ImmutableMap.of(Iron, 1, Aluminium, 1, Chromium, 1));
         /* Nichrome*/
-        E_BLAST_FURNACE.RB().temperature(2700).ii(of(4, DUST.getMaterialTag(Nickel), INGOT.getMaterialTag(Nickel)), of(1, DUST.getMaterialTag(Chromium), INGOT.getMaterialTag(Chromium)), INT_CIRCUITS.get(2))
+        E_BLAST_FURNACE.RB().temperature(2700).ii(of(4, DUST.getMaterialTag(Nickel), INGOT.getMaterialTag(Nickel)), of(1, DUST.getMaterialTag(Chromium), INGOT.getMaterialTag(Chromium)), SELECTOR_TAG_INGREDIENTS.get(2))
                 .io(INGOT_HOT.get(Nichrome, 5))
                 .add("nichrome_ingot", 135 * 20, 480);
         /* Osmiridium*/
diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/DistillationTowerLoader.java b/common/src/main/java/muramasa/gregtech/loader/multi/DistillationTowerLoader.java
index 10896f1e7..435702d0b 100644
--- a/common/src/main/java/muramasa/gregtech/loader/multi/DistillationTowerLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/multi/DistillationTowerLoader.java
@@ -11,11 +11,11 @@
 import tesseract.FluidPlatformUtils;
 import tesseract.TesseractGraphWrappers;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST_SMALL;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.gregtech.data.Materials.*;
 import static muramasa.gregtech.data.RecipeMaps.*;
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
 
 public class DistillationTowerLoader {
 
@@ -35,11 +35,11 @@ public static void init() {
         addDistillingRecipe(SeedOil, 32, 16, 96, ItemStack.EMPTY, new FluidProduct(Lubricant, 12));
         addDistillingRecipe(Water, 576, 16, 120, ItemStack.EMPTY, new FluidProduct(DistilledWater,520));
         DISTILLERY.RB()
-                .ii(INT_CIRCUITS.get(0).setNoConsume())
+                .ii(SELECTOR_TAG_INGREDIENTS.get(0).setNoConsume())
                 .fi(FluidPlatformUtils.createFluidStack(GTCoreFluids.BEET_JUICE.getFluid(), 100 * TesseractGraphWrappers.dropletMultiplier))
                 .fo(DistilledWater.getLiquid(50)).io(Items.SUGAR).add("beet_juice", 80, 16);
         DISTILLERY.RB()
-                .ii(INT_CIRCUITS.get(0).setNoConsume())
+                .ii(SELECTOR_TAG_INGREDIENTS.get(0).setNoConsume())
                 .fi(Honey.getLiquid(100))
                 .fo(DistilledWater.getLiquid(10)).io(Items.SUGAR).add("honey", 16, 16);
         addDistillingRecipe(DilutedHydrochloricAcid, 2000, 300, 64, ItemStack.EMPTY,
@@ -160,7 +160,7 @@ private static void addDistillationDistillingRecipe(Material input, int amount,
         addDistillationRecipe(input, amount, ticks, euPerTick, itemStack, outputs);
         for (int i = 0; i < outputs.length; i++){
             RecipeBuilder b = DISTILLERY.RB()
-                    .ii(INT_CIRCUITS.get(i + 1).setNoConsume())
+                    .ii(SELECTOR_TAG_INGREDIENTS.get(i + 1).setNoConsume())
                     .fi(input.has(AntimatterMaterialTypes.LIQUID) ? input.getLiquid(amount) : input.getGas(amount))
                     .fo(outputs[i].convert());
             if (!itemStack.isEmpty()) b.io(itemStack);
@@ -175,7 +175,7 @@ private static void addDistillationDistillingRecipe(Material input, int amount,
     private static void addDistillingRecipe(Material input, int amount, int ticks, int euPerTick, ItemStack itemStack, FluidProduct... outputs){
         for (int i = 0; i < outputs.length; i++){
             RecipeBuilder b = DISTILLERY.RB()
-                    .ii(INT_CIRCUITS.get(i + 1).setNoConsume())
+                    .ii(SELECTOR_TAG_INGREDIENTS.get(i + 1).setNoConsume())
                     .fi(input.has(AntimatterMaterialTypes.LIQUID) ? input.getLiquid(amount) : input.getGas(amount))
                     .fo(outputs[i].convert());
             if (!itemStack.isEmpty()) b.io(itemStack);
diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/FusionReactorLoader.java b/common/src/main/java/muramasa/gregtech/loader/multi/FusionReactorLoader.java
index b6bd0c3b7..32baed988 100644
--- a/common/src/main/java/muramasa/gregtech/loader/multi/FusionReactorLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/multi/FusionReactorLoader.java
@@ -1,17 +1,17 @@
 package muramasa.gregtech.loader.multi;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS;
 import static muramasa.antimatter.Ref.L;
 import static muramasa.antimatter.data.AntimatterMaterials.Gold;
 import static muramasa.antimatter.data.AntimatterMaterials.Iron;
 import static muramasa.gregtech.data.Materials.*;
 import static muramasa.gregtech.data.RecipeMaps.FUSION;
-import static muramasa.gregtech.data.TierMaps.INT_CIRCUITS;
 
 public class FusionReactorLoader {
     public static void init(){
-        FUSION.RB().fi(Deuterium.getGas(2000)).ii(INT_CIRCUITS.get(1)).fo(Helium3.getGas(500), Tritium.getGas(500)).add("helium3", 730, -8192, 191365120);
-        FUSION.RB().fi(Helium3.getGas(2000)).ii(INT_CIRCUITS.get(1)).fo(Helium.getGas(1000)).add("helium", 1280, -8192, 338165760);
-        FUSION.RB().fi(Tritium.getGas(2000)).ii(INT_CIRCUITS.get(1)).fo(Helium.getGas(1000)).add("helium_2", 1130, -8192, 269222720);
+        FUSION.RB().fi(Deuterium.getGas(2000)).ii(SELECTOR_TAG_INGREDIENTS.get(1)).fo(Helium3.getGas(500), Tritium.getGas(500)).add("helium3", 730, -8192, 191365120);
+        FUSION.RB().fi(Helium3.getGas(2000)).ii(SELECTOR_TAG_INGREDIENTS.get(1)).fo(Helium.getGas(1000)).add("helium", 1280, -8192, 338165760);
+        FUSION.RB().fi(Tritium.getGas(2000)).ii(SELECTOR_TAG_INGREDIENTS.get(1)).fo(Helium.getGas(1000)).add("helium_2", 1130, -8192, 269222720);
         FUSION.RB().fi(Helium3.getGas(1000), Deuterium.getGas(1000)).fo(Helium.getGas(1000)).add("helium_3", 1820, -2048, 60000000); //plasma
         FUSION.RB().fi(Tritium.getGas(1000), Deuterium.getGas(1000)).fo(Helium.getGas(1000)).add("helium_4", 1760, -8192, 40000000); //plasma
         FUSION.RB().fi(Helium.getGas(1000), Carbon.getLiquid(L)).fo(Oxygen.getGas(1000)).add("oxygen", 716, -8192, 80000000); //plasma
diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOvenLoader.java b/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOvenLoader.java
index 23ebf7be6..ef746fef5 100644
--- a/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOvenLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOvenLoader.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.RAW_ORE;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
@@ -20,22 +21,22 @@ public class PyrolysisOvenLoader {
     public static void init(){
         PYROLYSIS_OVEN.RB().ii(DUST.getMaterialIngredient(Materials.OilShale, 16)).fo(Materials.Oil.getLiquid(400)).add("oilshale", 200, 120);
         PYROLYSIS_OVEN.RB().ii(RAW_ORE.getMaterialIngredient(Materials.OilShale, 16)).fo(Materials.Oil.getLiquid(400)).add("oilshale_raw", 200, 120);
-        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1), TierMaps.INT_CIRCUITS.get(1)).fi(AntimatterMaterials.Water.getLiquid(1000)).fo(Materials.Biomass.getLiquid(1500)).add("biomass", 100, 10);
-        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1), TierMaps.INT_CIRCUITS.get(2)).fi(AntimatterMaterials.Water.getLiquid(1500)).fo(Materials.Biomass.getLiquid(1500)).add("fermented_biomass", 200, 10);
-        PYROLYSIS_OVEN.RB().ii(DUST.getMaterialIngredient(Sugar, 23), TierMaps.INT_CIRCUITS.get(1)).io(DUST.get(Charcoal, 12)).fo(Water.getLiquid(11000)).add("sugar_to_charcoal", 320, 64);
-        PYROLYSIS_OVEN.RB().ii(DUST.getMaterialIngredient(Sugar, 23), TierMaps.INT_CIRCUITS.get(2)).fi(Nitrogen.getGas(500)).io(DUST.get(Charcoal, 12)).fo(Water.getLiquid(11000)).add("sugar_to_charcoal_2", 160, 96);
-        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(5)).io(new ItemStack(Items.CHARCOAL, 20)).fo(WoodGas.getGas(1500)).add("wood_gas", 640, 64);
-        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(0)).io(new ItemStack(Items.CHARCOAL, 20)).fo(Creosote.getLiquid(4000)).add("creosote_oil", 640, 64);
-        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(2)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(Creosote.getLiquid(4000)).add("creosote_oil_nitrogen", 320, 64);
-        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(1)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodGas.getGas(1500)).add("wood_gas_nitrogen", 320, 64);
-        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(3)).io(DUST.get(Ash, 4)).fo(OilHeavy.getLiquid(4000)).add("oil_heavy", 320, 64);
+        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1), SELECTOR_TAG_INGREDIENTS.get(1)).fi(AntimatterMaterials.Water.getLiquid(1000)).fo(Materials.Biomass.getLiquid(1500)).add("biomass", 100, 10);
+        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(GTCoreItems.Biochaff, 1), SELECTOR_TAG_INGREDIENTS.get(2)).fi(AntimatterMaterials.Water.getLiquid(1500)).fo(Materials.Biomass.getLiquid(1500)).add("fermented_biomass", 200, 10);
+        PYROLYSIS_OVEN.RB().ii(DUST.getMaterialIngredient(Sugar, 23), SELECTOR_TAG_INGREDIENTS.get(1)).io(DUST.get(Charcoal, 12)).fo(Water.getLiquid(11000)).add("sugar_to_charcoal", 320, 64);
+        PYROLYSIS_OVEN.RB().ii(DUST.getMaterialIngredient(Sugar, 23), SELECTOR_TAG_INGREDIENTS.get(2)).fi(Nitrogen.getGas(500)).io(DUST.get(Charcoal, 12)).fo(Water.getLiquid(11000)).add("sugar_to_charcoal_2", 160, 96);
+        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(5)).io(new ItemStack(Items.CHARCOAL, 20)).fo(WoodGas.getGas(1500)).add("wood_gas", 640, 64);
+        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(0)).io(new ItemStack(Items.CHARCOAL, 20)).fo(Creosote.getLiquid(4000)).add("creosote_oil", 640, 64);
+        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(2)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(Creosote.getLiquid(4000)).add("creosote_oil_nitrogen", 320, 64);
+        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(1)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodGas.getGas(1500)).add("wood_gas_nitrogen", 320, 64);
+        PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(3)).io(DUST.get(Ash, 4)).fo(OilHeavy.getLiquid(4000)).add("oil_heavy", 320, 64);
         if (GregTechConfig.COMPLICATED_CHEMICAL_PROCESSING.get()){
-            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(7)).io(new ItemStack(Items.CHARCOAL, 20)).fo(WoodVinegar.getLiquid(3000)).add("wood_vinegar", 640, 64);
-            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(9)).io(new ItemStack(Items.CHARCOAL, 20)).fo(WoodTar.getLiquid(1500)).add("wood_tar", 640, 64);
-            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(6)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodGas.getGas(1500)).add("wood_gas_2", 320, 64);
-            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(8)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodVinegar.getLiquid(3000)).add("wood_vinegar_2", 320, 64);
-            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(10)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodTar.getLiquid(1500)).add("wood_tar_2", 320, 64);
-            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), TierMaps.INT_CIRCUITS.get(4)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(CharcoalByproducts.getGas(4000)).add("charcoal_byproducts", 320, 64);
+            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(7)).io(new ItemStack(Items.CHARCOAL, 20)).fo(WoodVinegar.getLiquid(3000)).add("wood_vinegar", 640, 64);
+            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(9)).io(new ItemStack(Items.CHARCOAL, 20)).fo(WoodTar.getLiquid(1500)).add("wood_tar", 640, 64);
+            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(6)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodGas.getGas(1500)).add("wood_gas_2", 320, 64);
+            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(8)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodVinegar.getLiquid(3000)).add("wood_vinegar_2", 320, 64);
+            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(10)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(WoodTar.getLiquid(1500)).add("wood_tar_2", 320, 64);
+            PYROLYSIS_OVEN.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 16), SELECTOR_TAG_INGREDIENTS.get(4)).io(new ItemStack(Items.CHARCOAL, 20)).fi(Nitrogen.getGas(1000)).fo(CharcoalByproducts.getGas(4000)).add("charcoal_byproducts", 320, 64);
         }
 
     }
diff --git a/gradle.properties b/gradle.properties
index 4b2feb030..f9d90c52a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ fabric_api_version=0.76.0+1.18.2
 fabric_transfer_api_version=1.6.+
 fabric_loader_version=0.14.6
 
-gt_core_version=0.1.1-pre35
+gt_core_version=0.1.1-pre36
 terraform_version=3.1.4
 jei_version=10.2.1.1004
 crafttweaker_version=9.1.207