diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua
index 5fa9037..19ce81c 100644
--- a/PHI-CL/data-final-fixes.lua
+++ b/PHI-CL/data-final-fixes.lua
@@ -2,8 +2,8 @@
 -- local main = require 'main'
 
 do
-    local sa = settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value
-    local p = settings.startup['PHI-VP'].value or sa
+    local sa = settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'SAP'
+    local p = (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP') or sa
 
     for k, v in pairs(data.raw.recipe) do
         if settings.startup['PHI-VP'].value and v.category == 'recycling' then
diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua
index d889469..c6c327e 100644
--- a/PHI-CL/main.lua
+++ b/PHI-CL/main.lua
@@ -87,7 +87,7 @@ function main.EEE(source, tier)
     end
 
     if source.tech == 'compound-energy' then
-        if mods['space-age'] and (not settings.startup['PHI-VP'].value) then
+        if mods['space-age'] and (not (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP')) then
             if not item.surface_conditions then
                 item.surface_conditions = {}
             end