diff --git a/changelog.txt b/changelog.txt
index 92e3c80..5f4e689 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.6.0
+Date: 2021-07-01
+  Changes:
+    - Support for Space Exploration 0.6
+---------------------------------------------------------------------------------------------------
 Version: 0.5.7
 Date: 2021-06-05
   Changes:
diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index a3a4b76..53ffba6 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -6,12 +6,6 @@ require("zirconium-recipe-final-rrr")
 local util = require("data-util");
 
 if mods["space-exploration"] then 
-  -- Organization
-  data.raw.item["zirconia"].subgroup = "plates"
-  data.raw.recipe["zirconia"].subgroup = "plates"
-  data.raw.item["zirconium-plate"].subgroup = "plates"
-  data.raw.recipe["zirconium-plate"].subgroup = "plates"
-
   -- core mining balancing
   util.add_to_product("se-core-fragment-omni", "zircon", -3)
 end
diff --git a/graphics/icons/molten-zirconium.png b/graphics/icons/molten-zirconium.png
new file mode 100644
index 0000000..6acc36d
Binary files /dev/null and b/graphics/icons/molten-zirconium.png differ
diff --git a/graphics/icons/molten-zirconium.xcf b/graphics/icons/molten-zirconium.xcf
new file mode 100644
index 0000000..72a39b6
Binary files /dev/null and b/graphics/icons/molten-zirconium.xcf differ
diff --git a/graphics/icons/zirconium-ingot.png b/graphics/icons/zirconium-ingot.png
new file mode 100644
index 0000000..b4b9332
Binary files /dev/null and b/graphics/icons/zirconium-ingot.png differ
diff --git a/graphics/icons/zirconium-ingot.xcf b/graphics/icons/zirconium-ingot.xcf
new file mode 100644
index 0000000..0bec6d8
Binary files /dev/null and b/graphics/icons/zirconium-ingot.xcf differ
diff --git a/info.json b/info.json
index 6c6c047..5ff8371 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "bzzirconium",
-    "version": "0.5.7",
+    "version": "0.6.0",
     "factorio_version": "1.1",
     "title": "Zirconium",
     "author": "Brevven",
diff --git a/locale/en/zirconium.cfg b/locale/en/zirconium.cfg
index a0a529c..55f0302 100644
--- a/locale/en/zirconium.cfg
+++ b/locale/en/zirconium.cfg
@@ -9,6 +9,7 @@ zircon=Zircon
 zirconium-dust=Zircon dust
 zirconia=Zirconia
 zirconium-plate=Zirconium plate
+zirconium-ingot=Ingot
 enriched-zircon=Enriched zircon
 compressed-zircon=Compressed zircon
 cermet=Cermet
@@ -22,6 +23,9 @@ enriched-zirconia=Can be efficiently smelted into zirconium plates.
 cermet=Advanced ceramic/metal composites.
 zirconium-tungstate=A material with interesting thermal properties.
 
+[fluid-name]
+molten-zirconium=Molten zirconium
+
 [technology-name]
 zirconia-processing=Zirconia processing
 cermet=Cermet
diff --git a/zirconium-recipe-final-stacking.lua b/zirconium-recipe-final-stacking.lua
index 473057d..ae612e0 100644
--- a/zirconium-recipe-final-stacking.lua
+++ b/zirconium-recipe-final-stacking.lua
@@ -15,6 +15,9 @@ if deadlock then
   if mods["Krastorio2"] or mods["space-exploration"] then
     deadlock.add_stack("zirconium-tungstate", nil, "deadlock-stacking-2", 64)
   end
+  if mods["space-exploration"] then
+    deadlock.add_stack("zirconium-ingot", nil, "deadlock-stacking-2", nil)
+  end
 end
 
 -- Deadlock crating recipes
@@ -31,5 +34,8 @@ if deadlock_crating then
   if mods["Krastorio2"] or mods["space-exploration"] then
     deadlock_crating.add_crate("zirconium-tungstate", "deadlock-crating-2")
   end
+  if mods["space-exploration"] then
+    deadlock_crating.add_crate("zirconium-ingot", "deadlock-crating-2")
+  end
 end
 
diff --git a/zirconium-recipe-se.lua b/zirconium-recipe-se.lua
index 9131a2a..8f998a9 100644
--- a/zirconium-recipe-se.lua
+++ b/zirconium-recipe-se.lua
@@ -21,6 +21,109 @@ if mods["space-exploration"] then
     ingredients = {{"zircon", 50}},
   }
   })
+if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
+  data:extend({
+  {
+    type = "item-subgroup",
+    name = "zirconium",
+    group = "resources",
+    order = "a-h-z-z",
+  }
+  })
+  data.raw.item["zirconia"].subgroup = "zirconium"
+  data.raw.item["zirconium-plate"].subgroup = "zirconium"
+  data:extend({
+  {
+    type = "item",
+    name = "zirconium-ingot",
+    icons = {{icon = "__bzzirconium__/graphics/icons/zirconium-ingot.png", icon_size = 128}},
+    order = "b-b",
+    stack_size = 50,
+    subgroup = "zirconium",
+  },
+  {
+    type = "fluid",
+    name = "molten-zirconium",
+    default_temperature = 600,
+    max_temperature = 600,
+    base_color = {r=121, g=80, b=80},
+    flow_color = {r=121, g=80, b=80},
+    icons = {{icon = "__bzzirconium__/graphics/icons/molten-zirconium.png", icon_size = 128}},
+    order = "a[molten]-a",
+    pressure_to_speed_ratio = 0.4,
+    flow_to_energy_ratio = 0.59,
+    auto_barrel = false,
+    subgroup = "fluid",
+  },
+  {
+    type = "recipe",
+    category = "smelting",
+    name = "molten-zirconium",
+    main_product = "molten-zirconium",
+    subgroup = "zirconium",
+    results = {
+      {type = "fluid", name = "molten-zirconium", amount = mods.Krastorio2 and 750 or 900},
+    },
+    energy_required = 60,
+    ingredients = {
+      {name = "zirconia", amount = 24},
+      {type = "fluid", name = "se-pyroflux", amount = 10},
+    },
+    enabled = false,
+    always_show_made_in = true,
+    allow_as_intermediate = false,
+    order = "a-a"
+  },
+  {
+    type = "recipe",
+    name = "zirconium-ingot",
+    category = "casting",
+    results = {{"zirconium-ingot", 1}},
+    energy_required = 100,
+    ingredients = {
+      {type = "fluid", name = "molten-zirconium", amount = 750},
+    },
+    enabled = false,
+    always_show_made_in = true,
+    allow_as_intermediate = false,
+  },
+  {
+    type = "recipe",
+    category = "crafting",
+    name = "zirconium-ingot-to-plate",
+
+    icons = {
+      {icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, icon_mipmaps = 3},
+      {icon = "__bzzirconium__/graphics/icons/zirconium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
+    },
+    results = {
+      {name = "zirconium-plate", amount = 10},
+    },
+    energy_required = 5,
+    ingredients = {
+      {name = "zirconium-ingot", amount = 1}
+    },
+    enabled = false,
+    always_show_made_in = true,
+    allow_decomposition = false,
+    order = "a-c-b"
+  },
+  })
+  util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-zirconium"})
+  util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot"})
+  util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot-to-plate"})
+  if mods["Krastorio2"] then
+    se_delivery_cannon_recipes["enriched-zirconium"] = {name= "enriched-zirconium"}
+  else
+    util.add_product("molten-zirconium", {"titanium-ore", 6})
+  end
+
+else
+  -- Organization
+  data.raw.item["zirconia"].subgroup = "plates"
+  data.raw.recipe["zirconia"].subgroup = "plates"
+  data.raw.item["zirconium-plate"].subgroup = "plates"
+  data.raw.recipe["zirconium-plate"].subgroup = "plates"
 
   if mods["Krastorio2"] then
     data:extend({
@@ -42,7 +145,7 @@ if mods["space-exploration"] then
       },
       icons =
       {
-        { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, icon_mipmaps = 3 },
+        { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128},
         { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}},
       },
     },
@@ -103,3 +206,4 @@ if mods["space-exploration"] then
     })
   util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "zirconia-smelting-vulcanite"})
 end
+end