diff --git a/changelog.txt b/changelog.txt
index 3a65f98..02d3a50 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,7 +2,8 @@
 Version: 0.1.6
 Date: 2022-08-19
   Changes:
-    - When used with Aluminum but not Lead, add new solder tech after copper-processing.
+    - When used with Aluminum but not Lead, add new solder tech after copper-processing. Solder and
+      pipe to ground unlock with (or after) this tech.
     - Minor recipe tweaks, including simpler pipe to ground recipe
   Localization:
     - ja, thanks to Sakuro
diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index 2ceda36..ef519c6 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -11,7 +11,6 @@ util.set_main_product("se-glass-vulcanite", "glass")
 -- core mining balancing
 util.add_to_product("se-core-fragment-omni", "tin-ore", -4)
 
-
 -- Electronic circuits need final fixes
 util.multiply_recipe("electronic-circuit-stone", 2)
 util.replace_some_ingredient("electronic-circuit-stone", "copper-cable", 1, "solder", 1)
diff --git a/info.json b/info.json
index 4b073ea..01af265 100644
--- a/info.json
+++ b/info.json
@@ -16,6 +16,7 @@
       "? bzcarbon >= 0.3.0",
       "? bzaluminum >= 0.4.9",
       "? space-exploration >= 0.5.100",
+      "(?) aai-industry",
       "? aai-industry",
       "? Krastorio2",
       "? sand-and-glass",
diff --git a/tin-recipe.lua b/tin-recipe.lua
index 13c64e9..664a68b 100644
--- a/tin-recipe.lua
+++ b/tin-recipe.lua
@@ -94,7 +94,6 @@ if mods.bzaluminum and not mods.bzlead then
     icon_size = 128,
     effects = {
       { type = "unlock-recipe", recipe = "solder" },
-      { type = "unlock-recipe", recipe = "pipe-to-ground" },
     },
     unit = {
       count = 10, time = 15,
@@ -103,9 +102,17 @@ if mods.bzaluminum and not mods.bzlead then
     prerequisites = {"copper-processing"},
   },
   })
-  util.add_unlock_force("solder", "pipe-to-ground")
   util.add_unlock_force("solder", "solder")
   util.add_prerequisite("electronics", "solder")
+  if mods["aai-industry"] or mods.Krastorio2 then
+    util.add_prerequisite("basic-fluid-handling", "solder")
+    util.add_prerequisite("kr-basic-fluid-handling", "solder")
+  else
+    util.add_unlock_force("solder", "pipe-to-ground")
+  end
+  if mods.Krastorio2 then
+    util.set_tech_recipe("solder", {{"basic-tech-card", 1}})
+  end
 end
 
 data:extend({