diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt
index 38dd8d81e..dc74bf41d 100644
--- a/config/ftbquests/quests/chapters/end_game.snbt
+++ b/config/ftbquests/quests/chapters/end_game.snbt
@@ -522,19 +522,21 @@
 				"65C40A41F29687F4"
 			]
 			description: [
-				"Changing the circuit value on your newfound &9Subatomic Digital Assembler&r will allow you to assemble &9Creative ME Fluid Cells&r."
+				"Changing the circuit value on your newfound &3Subatomic Digital Assembler&r will allow you to assemble &9ME Infinity Cell Bases&r."
 				""
-				"These are kind of like the previous &9infinite cells&r, but you can partition this one in a &6cell workbench&r to tell what fluids it should stock."
+				"[\"These can be used to make infinite sources of fluid in ME cell form like the \", {\"text\": \"ME Infinity Water Cell,\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"26C9F1514FD08C81\" } },\" but for any fluid.\"]"
+				""
+				"To do so, combine the &9ME Infinity Cell Base&r with a &efilled&r &6Fluid Cell&r in a &3Crafting Table&r to assign the cell to that fluid."
 			]
 			hide_until_deps_visible: true
 			id: "2F21C6B6F145EA81"
 			optional: true
 			tasks: [{
 				id: "390C1F547BDF7D2B"
-				item: "ae2:creative_fluid_cell"
+				item: "kubejs:infinity_cell_base"
 				type: "item"
 			}]
-			title: "&9Creative Fluid Cell"
+			title: "&9ME Infinity Cell Base"
 			x: 31.0d
 			y: -9.5d
 		}
diff --git a/kubejs/assets/kubejs/textures/item/infinity_cell_base.png b/kubejs/assets/kubejs/textures/item/infinity_cell_base.png
new file mode 100644
index 000000000..07f3dcb8d
Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/infinity_cell_base.png differ
diff --git a/kubejs/server_scripts/gregtech/subatomic_digital_assembler.js b/kubejs/server_scripts/gregtech/subatomic_digital_assembler.js
index 0c963afd2..ffce9290d 100644
--- a/kubejs/server_scripts/gregtech/subatomic_digital_assembler.js
+++ b/kubejs/server_scripts/gregtech/subatomic_digital_assembler.js
@@ -59,6 +59,16 @@ ServerEvents.recipes(event => {
     if (isNormalMode) {
         sda_print('creative_tank_data', 1, 'gtceu:creative_tank', 64)
         //sda_print('creative_tank_data', 2, 'ae2:creative_fluid_cell', 64) //The fluid cell can output items as a bug. See #8193 on the AE2 Github.
+    
+        //Replacement solution with ExtendedAE's Infinity Cells
+        sda_print('creative_tank_data', 2, 'kubejs:infinity_cell_base', 64)
+        Item.of('expatternprovider:infinity_cell', '{record:{"#c":"ae2:f",id:"minecraft:water"}}')
+        event.shapeless('expatternprovider:infinity_cell', ['kubejs:infinity_cell_base', 'gtceu:fluid_cell']).modifyResult((grid, result) => {
+            let item = grid.find('gtceu:fluid_cell')
+            if (item.nbt != null && item.nbt.Fluid != null && item.nbt.Fluid.FluidName != null) {
+                return result.withNBT({record:{"#c":"ae2:f",id:item.nbt.Fluid.FluidName}})
+            }
+		})
     }
 
     if (!isNormalMode) {
diff --git a/kubejs/startup_scripts/registry/item_registry.js b/kubejs/startup_scripts/registry/item_registry.js
index 975611531..d1f3a3cbc 100644
--- a/kubejs/startup_scripts/registry/item_registry.js
+++ b/kubejs/startup_scripts/registry/item_registry.js
@@ -136,6 +136,9 @@ StartupEvents.registry('item', event => {
     event.create('creative_energy_data')
     if (!isNormalMode) event.create('omnic_data')
 
+    //Infinity Fluid Cell Base
+    event.create('infinity_cell_base').displayName("ME Infinity Cell Base")
+
 
     // Endgame Items
     event.create('diamond_lattice')