diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index 3cfc601..f623530 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -702,63 +702,6 @@ if settings.startup['PHI-MI'].value then
     data.raw['utility-constants'].default.default_pipeline_extent = settings.startup['PHI-MI-PIPE-EXTENT'].value
 end
 
-if mods['space-age'] and settings.startup['PHI-SA'].value and settings.startup['PHI-SA-QUALITY'].value then
-    for _, v in pairs(data.raw.module) do
-        if v.category and v.category == 'quality' then
-            v.effect.quality = v.effect.quality * settings.startup['PHI-SA-QUALITY'].value / 10
-
-        elseif v.category and v.category == 'speed' and settings.startup['PHI-SA-QUALITY'].value ~= 10 then
-            v.effect.quality = nil
-        end
-    end
-end
-
-if mods['space-age'] and ((settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-ENABLE-QUALITY'].value)) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '')) then
-    for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do
-        if data.raw.technology[v] then
-            data.raw.technology[v].hidden = true
-            data.raw.technology[v].hidden_in_factoriopedia = true
-            data.raw.technology[v].unit.ingredients = {{'space-science-pack', 1}}
-            data.raw.technology[v].effects = nil
-        end
-
-        if data.raw.module[v] then
-            data.raw.module[v].hidden = true
-            data.raw.module[v].hidden_in_factoriopedia = true
-        end
-
-        if data.raw.recipe[v] then
-            data.raw.recipe[v].hidden = true
-            data.raw.recipe[v].hidden_in_factoriopedia = true
-        end
-    end
-
-    for _, v in pairs({'epic-quality', 'legendary-quality'}) do
-        data.raw.technology[v].hidden = true
-        data.raw.technology[v].hidden_in_factoriopedia = true
-        data.raw.technology[v].unit.ingredients = {{'space-science-pack', 1}}
-        data.raw.technology[v].effects = nil
-    end
-
-    for _, v in pairs({'normal', 'uncommon', 'rare', 'epic', 'legendary'}) do
-        data.raw.quality[v].next = nil
-        data.raw.quality[v].next_probability = nil
-        data.raw.quality[v].hidden = true
-        data.raw.quality[v].hidden_in_factoriopedia = true
-    end
-
-    for _, v in pairs({'quality', 'quality-modules', 'quality-factoriopedia', 'quality-probabilities'}) do
-        data.raw['tips-and-tricks-item'][v] = nil
-    end
-
-    data.raw['produce-achievement']['crafting-with-quality'] = nil
-    data.raw['module-transfer-achievement']['make-it-better'] = nil
-    data.raw['produce-achievement']['my-modules-are-legendary'] = nil
-    data.raw['equip-armor-achievement']['look-at-my-shiny-rare-armor'] = nil
-    data.raw['use-item-achievement']['todays-fish-is-trout-a-la-creme'] = nil
-    data.raw['place-equipment-achievement']['no-room-for-more'] = nil
-end
-
 if settings.startup['PHI-SA'].value and settings.startup['PHI-SA-SPOIL-FREEZE'].value and settings.startup['PHI-SA-SPOIL'].value and mods['space-age'] then
     local function spoil_handle(i)
         local item = table.deepcopy(i)
@@ -850,6 +793,63 @@ if (settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-SPOIL'].v
     end
 end
 
+if mods['space-age'] and settings.startup['PHI-SA'].value and settings.startup['PHI-SA-QUALITY'].value then
+    for _, v in pairs(data.raw.module) do
+        if v.category and v.category == 'quality' then
+            v.effect.quality = v.effect.quality * settings.startup['PHI-SA-QUALITY'].value / 10
+
+        elseif v.category and v.category == 'speed' and settings.startup['PHI-SA-QUALITY'].value ~= 10 then
+            v.effect.quality = nil
+        end
+    end
+end
+
+if mods['space-age'] and ((settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-ENABLE-QUALITY'].value)) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '')) then
+    for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do
+        if data.raw.technology[v] then
+            data.raw.technology[v].hidden = true
+            data.raw.technology[v].hidden_in_factoriopedia = true
+            data.raw.technology[v].unit.ingredients = {{'space-science-pack', 1}}
+            data.raw.technology[v].effects = nil
+        end
+
+        if data.raw.module[v] then
+            data.raw.module[v].hidden = true
+            data.raw.module[v].hidden_in_factoriopedia = true
+        end
+
+        if data.raw.recipe[v] then
+            data.raw.recipe[v].hidden = true
+            data.raw.recipe[v].hidden_in_factoriopedia = true
+        end
+    end
+
+    for _, v in pairs({'epic-quality', 'legendary-quality'}) do
+        data.raw.technology[v].hidden = true
+        data.raw.technology[v].hidden_in_factoriopedia = true
+        data.raw.technology[v].unit.ingredients = {{'space-science-pack', 1}}
+        data.raw.technology[v].effects = nil
+    end
+
+    for _, v in pairs({'normal', 'uncommon', 'rare', 'epic', 'legendary'}) do
+        data.raw.quality[v].next = nil
+        data.raw.quality[v].next_probability = nil
+        data.raw.quality[v].hidden = true
+        data.raw.quality[v].hidden_in_factoriopedia = true
+    end
+
+    for _, v in pairs({'quality', 'quality-modules', 'quality-factoriopedia', 'quality-probabilities'}) do
+        data.raw['tips-and-tricks-item'][v] = nil
+    end
+
+    data.raw['produce-achievement']['crafting-with-quality'] = nil
+    data.raw['module-transfer-achievement']['make-it-better'] = nil
+    data.raw['produce-achievement']['my-modules-are-legendary'] = nil
+    data.raw['equip-armor-achievement']['look-at-my-shiny-rare-armor'] = nil
+    data.raw['use-item-achievement']['todays-fish-is-trout-a-la-creme'] = nil
+    data.raw['place-equipment-achievement']['no-room-for-more'] = nil
+end
+
 if mods['space-age'] and (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then
     data.raw['character']['character']['mining_categories'] = {'basic-solid', 'hard-solid'}