diff --git a/graphics/icons/pcb.png b/graphics/icons/pcb.png
new file mode 100644
index 0000000..3853b80
Binary files /dev/null and b/graphics/icons/pcb.png differ
diff --git a/locale/en/salt.cfg b/locale/en/salt.cfg
index 0d62f24..636e0f9 100644
--- a/locale/en/salt.cfg
+++ b/locale/en/salt.cfg
@@ -7,9 +7,11 @@ salt=[item=salt] __ENTITY__salt__
 [item-name]
 salt=__ENTITY__salt__
 ferric-chloride=Ferric chloride
-pcb-substrate=PCB Substrate
+pcb=PCB
+pcb-substrate=__ITEM__pcb__ Substrate
 
 [item-description]
+pcb=Printed circuit board
 
 [fluid-name]
 chlorine=Chlorine
diff --git a/pcb.lua b/pcb.lua
index 7c9d216..8e6d573 100644
--- a/pcb.lua
+++ b/pcb.lua
@@ -7,9 +7,19 @@ data:extend({
     icon = "__bzchlorine__/graphics/icons/pcb-substrate.png",
     icon_size = 128,
     subgroup = "intermediate-product",
-    order = "b[pcb-s]",
+    order = "f[advanced-circuit][pcb-substrate]",
     stack_size = util.get_stack_size(200),
   },
+  {
+    type = "item",
+    name = "pcb",
+    icon = "__bzchlorine__/graphics/icons/pcb.png",
+    icon_size = 128,
+    subgroup = "intermediate-product",
+    order = "f[advanced-circuit][pcb]",
+    stack_size = util.get_stack_size(200),
+  },
+
 })
 data:extend({
   {
@@ -26,6 +36,27 @@ data:extend({
     category = "chemistry",
     energy_requires = 3,
   },
+  {
+    type = "recipe",
+    name = "pcb",
+    results = {
+      {"pcb", 1},
+    },
+    ingredients = {
+      {"pcb-substrate", 1},
+      {"copper-plate", 1},
+      {"ferric-chloride", 1},
+    },
+    enabled = false,
+    category = "chemistry",
+    energy_requires = 3,
+  },
 })
+
+util.add_unlock("advanced-electronics", "pcb-substrate")
+util.add_unlock("advanced-electronics", "pcb")
+
+-- These updates should be in data phase
 util.replace_some_ingredient("pcb-substrate", "plastic-bar", 1, "silica", 3)
-util.replace_some_ingredient("pcb-substrate", "plastic-bar", 1, "bakelite")
+util.replace_some_ingredient("pcb-substrate", "plastic-bar", 1, "bakelite", 1)
+util.replace_ingredient("advanced-circuit", "plastic-bar", "pcb", 1)