diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua
index b945419..b8d2da6 100644
--- a/PHI-CL/data/b/gm-vp-c.lua
+++ b/PHI-CL/data/b/gm-vp-c.lua
@@ -489,6 +489,34 @@ local items = {
         'asteroid-productivity',
         'calcite-processing',
     },
+    ['achievement'] = {
+        -- SPACE_AGE 0
+        ['logistic-network-embargo'] = 'dont-build-entity-achievement',
+        ['reach-for-the-stars'] = 'create-platform-achievement',
+        ['second-star-to-the-right-and-straight-on-till-morning'] = 'complete-objective-achievement',
+        ['rush-to-space'] = 'dont-research-before-researching-achievement',
+        ['shattered-planet-1'] = 'space-connection-distance-traveled-achievement',
+        -- SPACE_AGE 5
+        ['shattered-planet-2'] = 'space-connection-distance-traveled-achievement',
+        ['shattered-planet-3'] = 'space-connection-distance-traveled-achievement',
+        ['research-with-metallurgics'] = 'research-with-science-pack-achievement',
+        ['research-with-agriculture'] = 'research-with-science-pack-achievement',
+        ['research-with-electromagnetics'] = 'research-with-science-pack-achievement',
+        -- SPACE_AGE 10
+        ['research-with-cryogenics'] = 'research-with-science-pack-achievement',
+        ['research-with-promethium'] = 'research-with-science-pack-achievement',
+        ['it-stinks-and-they-do-like-it'] = 'group-attack-achievement',
+        ['get-off-my-lawn'] = 'group-attack-achievement',
+        ['if-it-bleeds'] = 'kill-achievement',
+        -- SPACE_AGE 15
+        ['we-need-bigger-guns'] = 'kill-achievement',
+        ['size-doesnt-matter'] = 'kill-achievement',
+        ['visit-vulcanus'] = 'change-surface-achievement',
+        ['visit-gleba'] = 'change-surface-achievement',
+        ['visit-fulgora'] = 'change-surface-achievement',
+        -- SPACE_AGE 20
+        ['visit-aquilo'] = 'change-surface-achievement'
+    },
     ['recipe'] = {
         ['recycler'] = true,
         ['lightning-collector'] = true,
@@ -659,29 +687,6 @@ local items = {
         ['small-stomper-pentapod'] = 'spider-unit',
         ['medium-stomper-pentapod'] = 'spider-unit',
         ['big-stomper-pentapod'] = 'spider-unit',
-    },
-    ['achievement'] = {
-        ['logistic-network-embargo'] = 'dont-build-entity-achievement',
-        ['reach-for-the-stars'] = 'create-platform-achievement',
-        ['second-star-to-the-right-and-straight-on-till-morning'] = 'complete-objective-achievement',
-        ['rush-to-space'] = 'dont-research-before-researching-achievement',
-        ['shattered-planet-1'] = 'space-connection-distance-traveled-achievement',
-        ['shattered-planet-2'] = 'space-connection-distance-traveled-achievement',
-        ['shattered-planet-3'] = 'space-connection-distance-traveled-achievement',
-        ['research-with-metallurgics'] = 'research-with-science-pack-achievement',
-        ['research-with-agriculture'] = 'research-with-science-pack-achievement',
-        ['research-with-electromagnetics'] = 'research-with-science-pack-achievement',
-        ['research-with-cryogenics'] = 'research-with-science-pack-achievement',
-        ['research-with-promethium'] = 'research-with-science-pack-achievement',
-        ['it-stinks-and-they-do-like-it'] = 'group-attack-achievement',
-        ['get-off-my-lawn'] = 'group-attack-achievement',
-        ['if-it-bleeds'] = 'kill-achievement',
-        ['we-need-bigger-guns'] = 'kill-achievement',
-        ['size-doesnt-matter'] = 'kill-achievement',
-        ['visit-vulcanus'] = 'change-surface-achievement',
-        ['visit-gleba'] = 'change-surface-achievement',
-        ['visit-fulgora'] = 'change-surface-achievement',
-        ['visit-aquilo'] = 'change-surface-achievement'
     }
 }
 
diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua
index adbadb8..a23c607 100644
--- a/PHI-CL/data/b/gm-vp.lua
+++ b/PHI-CL/data/b/gm-vp.lua
@@ -318,6 +318,7 @@ if items['tips_and_tricks_item'] then
     end
 end
 
+-- GM-VP H 21 SPACE_AGE ACHIEVEMENT
 if items['achievement'] then
     for k, v in pairs(items['achievement']) do
         if data.raw[v][k] then
@@ -447,12 +448,10 @@ for _, v in pairs(data.raw['tile']) do
     end
 end
 
-data.raw['tile']['empty-space'].hidden = true
-data.raw['tile']['empty-space'].hidden_in_factoriopedia = true
-data.raw['tile']['space-platform-foundation'].hidden = true
-data.raw['tile']['space-platform-foundation'].hidden_in_factoriopedia = true
-data.raw['tile']['foundation'].hidden = true
-data.raw['tile']['foundation'].hidden_in_factoriopedia = true
+for _, v in pairs({'empty-space', 'space-platform-foundation', 'foundation'}) do
+    data.raw.tile[v].hidden = true
+    data.raw.tile[v].hidden_in_factoriopedia = true
+end
 
 for _, v in pairs({'cliff-fulgora', 'cliff-gleba', 'cliff-vulcanus', 'crater-cliff'}) do
     data.raw['cliff'][v].hidden = true