diff --git a/prototypes/gold-ore.lua b/prototypes/gold-ore.lua
index b1fb102..900c21c 100644
--- a/prototypes/gold-ore.lua
+++ b/prototypes/gold-ore.lua
@@ -3,8 +3,105 @@ local noise = require('noise');
 
 local util = require("data-util");
 
-data:extend(
-{
+data:extend({
+	{
+    type = "autoplace-control",
+    category = "resource",
+    name = "gold-ore",
+    richness = true,
+    order = "b-e"
+	},
+	{
+    type = "noise-layer",
+    name = "gold-ore"
+	},
+	{
+    type = "resource",
+    name = "gold-ore",
+    icon = "__bzgold__/graphics/icons/gold-ore.png",
+    icon_size = 128,
+    flags = {"placeable-neutral"},
+    order="a-b-a",
+    map_color = {r=1.00, g=0.90, b=0.10},
+    minable =
+    {
+      hardness = 1,
+      mining_particle = "gold-ore-particle",
+      mining_time = 1,
+      results = 
+      util.se6() and
+      {
+        {type="item", name="gold-ore", amount=1, probability=.75},
+        {type="item", name="stone", amount=1, probability=.25},
+      } or
+      {
+        {type="item", name="gold-ore", amount=1, probability=.25},
+        {type="item", name="stone", amount=1, probability=.75},
+      }
+    },
+    collision_box = {{ -0.1, -0.1}, {0.1, 0.1}},
+    selection_box = {{ -0.5, -0.5}, {0.5, 0.5}},
+
+    autoplace = resource_autoplace.resource_autoplace_settings{
+      name = "gold-ore",
+      order = "b-z",
+      base_density = 1,
+      base_spots_per_km2 = 1,
+      has_starting_area_placement = false,
+      regular_rq_factor_multiplier = 1,
+      starting_rq_factor_multiplier = 1,
+    },
+
+    stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80},
+        stages =
+        {
+          sheet =
+          {
+      filename = "__bzgold__/graphics/entity/ores/gold-ore.png",
+      priority = "extra-high",
+      size = 64,
+      frame_count = 8,
+      variation_count = 8,
+      hr_version =
+      {
+      filename = "__bzgold__/graphics/entity/ores/hr-gold-ore.png",
+        priority = "extra-high",
+        size = 128,
+        frame_count = 8,
+        variation_count = 8,
+        scale = 0.5
+      }
+          }
+    },
+  },
+  {
+      type = "item",
+      name = "gold-ore",
+      icon_size = 128,
+      icon = "__bzgold__/graphics/icons/gold-ore.png",
+      pictures = {
+        {filename="__bzgold__/graphics/icons/gold-ore.png", size=128, scale=0.125},
+        {filename="__bzgold__/graphics/icons/gold-ore-1.png", size=128, scale=0.125},
+        {filename="__bzgold__/graphics/icons/gold-ore-2.png", size=128, scale=0.125},
+        {filename="__bzgold__/graphics/icons/gold-ore-3.png", size=128, scale=0.125},
+        {filename="__bzgold__/graphics/icons/gold-ore-4.png", size=128, scale=0.125},
+      },
+      subgroup = "raw-resource",
+      order = "a-a-a",
+      stack_size = util.get_stack_size(50)
+  },
+})
+
+if util.se6() then
+  se_resources["gold-ore"] = {
+    order = "b-z-g",
+    has_starting_area_placement = false,
+    base_density = 1,
+    base_spots_per_km2 = 1,
+  }
+end
+
+data:extend({
   {
     type = "optimized-particle",
     name = "gold-ore-particle",
@@ -145,88 +242,5 @@ data:extend(
       }
     }
   }
-}
-)
-
-data:extend({
-	{
-    type = "autoplace-control",
-    category = "resource",
-    name = "gold-ore",
-    richness = true,
-    order = "b-e"
-	},
-	{
-    type = "noise-layer",
-    name = "gold-ore"
-	},
-	{
-    type = "resource",
-    icon_size = 64, icon_mipmaps = 3,
-    name = "gold-ore",
-    icon = "__bzgold__/graphics/icons/gold-ore.png",
-    flags = {"placeable-neutral"},
-    order="a-b-a",
-    map_color = {r=1.00, g=0.90, b=0.10},
-    minable =
-    {
-      hardness = 1,
-      mining_particle = "gold-ore-particle",
-      mining_time = 1,
-      results = {
-        {type="item", name="gold-ore", amount=1, probability=.25},
-        {type="item", name="stone", amount=1, probability=.75},
-      }
-    },
-    collision_box = {{ -0.1, -0.1}, {0.1, 0.1}},
-    selection_box = {{ -0.5, -0.5}, {0.5, 0.5}},
-
-    autoplace = resource_autoplace.resource_autoplace_settings{
-      name = "gold-ore",
-      order = "b-z",
-      base_density = 1,
-      base_spots_per_km2 = 1,
-      has_starting_area_placement = true, -- TODO CHANGE THIS
-      regular_rq_factor_multiplier = 1,
-      starting_rq_factor_multiplier = 1,
-    },
-
-    stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80},
-        stages =
-        {
-          sheet =
-          {
-      filename = "__bzgold__/graphics/entity/ores/gold-ore.png",
-      priority = "extra-high",
-      size = 64,
-      frame_count = 8,
-      variation_count = 8,
-      hr_version =
-      {
-      filename = "__bzgold__/graphics/entity/ores/hr-gold-ore.png",
-        priority = "extra-high",
-        size = 128,
-        frame_count = 8,
-        variation_count = 8,
-        scale = 0.5
-      }
-          }
-    },
-  },
-  {
-      type = "item",
-      name = "gold-ore",
-      icon_size = 128,
-      icon = "__bzgold__/graphics/icons/gold-ore.png",
-      pictures = {
-        {filename="__bzgold__/graphics/icons/gold-ore.png", size=128, scale=0.125},
-        {filename="__bzgold__/graphics/icons/gold-ore-1.png", size=128, scale=0.125},
-        {filename="__bzgold__/graphics/icons/gold-ore-2.png", size=128, scale=0.125},
-        {filename="__bzgold__/graphics/icons/gold-ore-3.png", size=128, scale=0.125},
-        {filename="__bzgold__/graphics/icons/gold-ore-4.png", size=128, scale=0.125},
-      },
-      subgroup = "raw-resource",
-      order = "t-c-a",
-      stack_size = util.get_stack_size(50)
-  },
 })
+
diff --git a/prototypes/gold.lua b/prototypes/gold.lua
index 36cc445..8e6fc8d 100644
--- a/prototypes/gold.lua
+++ b/prototypes/gold.lua
@@ -1,14 +1,5 @@
 local util = require("data-util");
 
-local results = {{"gold-ingot", 1}}
-
-if util.me.silver() and util.me.byproduct() then
-  results = {
-    {type = "item", name="gold-ingot", amount=1, probability=.9},
-    {type = "item", name="silver-ore", amount=1, probability=.1},
-  }
-end
-
 data:extend({
   {
     type = "item",
@@ -19,17 +10,6 @@ data:extend({
     order = "b[gold-ingot]",
     stack_size = util.get_stack_size(100),
   },
-  {
-    type = "recipe",
-    name = "gold-ingot",
-    main_product = "gold-ingot",
-    category = "smelting",
-    order = "d[gold-ingot]",
-    enabled = false,
-    energy_required = 1.6,
-    ingredients = {{"gold-ore", 1}},
-    results = results,
-  },
   {
     type = "technology",
     name = "gold-processing",
@@ -54,3 +34,48 @@ data:extend({
     order = "b-b",
   },
 })
+
+if mods.Krastorio2 then
+  local results = {{"gold-ingot", 5}}
+  if util.me.silver() and util.me.byproduct() then
+    results = {
+      {type = "item", name="gold-ingot", amount=4},
+      {type = "item", name="silver-ore", amount=2},
+    }
+  end
+  data:extend({
+    {
+      type = "recipe",
+      name = "gold-ingot",
+      main_product = "gold-ingot",
+      category = "smelting",
+      order = "d[gold-ingot]",
+      enabled = false,
+      energy_required = 8,
+      ingredients = {{"gold-ore", 20}},
+      results = results,
+    },
+  })
+else
+  local results = {{"gold-ingot", 1}}
+  if util.me.silver() and util.me.byproduct() then
+    results = {
+      {type = "item", name="gold-ingot", amount=1, probability=.9},
+      {type = "item", name="silver-ore", amount=1, probability=.2},
+    }
+  end
+
+  data:extend({
+    {
+      type = "recipe",
+      name = "gold-ingot",
+      main_product = "gold-ingot",
+      category = "smelting",
+      order = "d[gold-ingot]",
+      enabled = false,
+      energy_required = 1.6,
+      ingredients = {{"gold-ore", 2}},
+      results = results,
+    },
+  })
+end