diff --git a/PHI-CL/config-updates.lua b/PHI-CL/config-updates.lua
index 9b5bbf3..8b13789 100644
--- a/PHI-CL/config-updates.lua
+++ b/PHI-CL/config-updates.lua
@@ -1,17 +1 @@
-local items = {}
 
-if mods and mods['space-exploration'] then
-    items['equipment']['fission-reactor-equipment'].tech = 'se-rtg-equipment'
-    items['equipment']['fission-reactor-equipment'].base_name = 'se-rtg'
-
-    items['equipment']['battery-equipment'].tech = 'battery-equipment'
-    items['equipment']['battery-equipment'].min = 2
-
-    items['equipment']['energy-shield-equipment'].tech = 'energy-shield-equipment'
-    items['equipment']['energy-shield-equipment'].min = 2
-
-    items['equipment']['personal-roboport-equipment'].tech = 'personal-roboport-equipment'
-    items['equipment']['personal-roboport-equipment'].min = 2
-end
-
-return items
diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua
index 1585fd9..c9d8297 100644
--- a/PHI-CL/config.lua
+++ b/PHI-CL/config.lua
@@ -369,12 +369,6 @@ local items = {
     }
 }
 
-if mods and mods['space-age'] then
-    items['equipment']['battery-equipment'].ref_name = 'battery-mk3-equipment'
-    items['equipment']['battery-equipment'].tech = 'battery-mk3-equipment'
-    items['equipment']['battery-equipment'].min = 4
-end
-
 if mods and mods['quality'] then
     items['item']['recycler'] = {
         enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value,
diff --git a/PHI-CL/data/b/mbq-c.lua b/PHI-CL/data/b/mbq-c.lua
index 78516cf..bb6c7ed 100644
--- a/PHI-CL/data/b/mbq-c.lua
+++ b/PHI-CL/data/b/mbq-c.lua
@@ -3,9 +3,9 @@ return {
     ['battery-equipment'] = {
         type = 'battery-equipment',
         name = 'battery',
-        ref_name = 'battery-mk2-equipment',
-        tech = 'battery-mk2-equipment',
-        min = 3,
+        ref_name = (mods['space-age'] and 'battery-mk3-equipment') or 'battery-mk2-equipment',
+        tech = (mods['space-age'] and 'battery-mk3-equipment') or (mods['space-exploration'] and 'battery-equipment') or 'battery-mk2-equipment',
+        min = (mods['space-age'] and 4) or (mods['space-exploration'] and 2) or 3,
         max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
     },
     -- MBQ A 7 BASE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
@@ -19,9 +19,9 @@ return {
     ['energy-shield-equipment'] = {
         type = 'energy-shield-equipment',
         name = 'energy-shield',
-        ref_name = 'energy-shield-mk2-equipment',
+        ref_name = (mods['space-exploration'] and 'energy-shield-equipment') or 'energy-shield-mk2-equipment',
         tech = 'energy-shield-mk2-equipment',
-        min = 3,
+        min = (mods['space-exploration'] and 2) or 3,
         max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
     },
     -- MBQ A 1 BASE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT
@@ -35,6 +35,7 @@ return {
     ['fission-reactor-equipment'] = {
         type = 'generator-equipment',
         name = 'fission-reactor',
+        ref_name = (mods['space-exploration'] and 'se-rtg-equipment') or 'fission-reactor-equipment',
         tech = 'fission-reactor-equipment',
         max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
     },
@@ -57,8 +58,8 @@ return {
         type = 'roboport-equipment',
         name = 'personal-roboport',
         ref_name = 'personal-roboport-mk2-equipment',
-        tech = 'personal-roboport-mk2-equipment',
-        min = 3,
+        tech = (mods['space-exploration'] and 'personal-roboport-equipment') or 'personal-roboport-mk2-equipment',
+        min = (mods['space-exploration'] and 2) or 3,
         max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
     },
     -- MBQ A 7 BASE ARMOR_EQUIPMENT,RECIPE,RESEARCH_EFFECT