diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 3d2d6d95..36405ce8 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -538,6 +538,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials HeavyFuel = new Materials(741, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 255, 255, 0, 0, "HeavyFuel", "Heavy Fuel", 3, 192, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack).setCanBeCracked(true);
     public static Materials LPG = new Materials(742, TextureSet.SET_FLUID, 				1.0F, 0, 0, 16, 255, 255, 0, 0, "LPG", "LPG", 1, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow);
 
+    public static Materials Pyrochlore = new MaterialBuilder(607, TextureSet.SET_METALLIC, "Pyrochlore").addDustItems().addOreItems().setRGB(43, 17, 0).setColor(Dyes.dyeBlack).setMaterialList(new MaterialStack(Calcium, 2), new MaterialStack(Niobium, 2), new MaterialStack(Oxygen, 7)).addElectrolyzerRecipe().constructMaterial();
     public static Materials GrowthMediumRaw = new MaterialBuilder(608, TextureSet.SET_FLUID, "Raw Growth Medium").setName("GrowthMediumRaw").addCell().addFluid().setRGB(211, 141, 95).setColor(Dyes.dyeOrange).constructMaterial();
     public static Materials GrowthMediumSterilized = new MaterialBuilder(609, TextureSet.SET_FLUID, "Sterilized Growth Medium").setName("GrowthMediumSterilized").addCell().addFluid().setRGB(222, 170, 135).setColor(Dyes.dyeOrange).constructMaterial();
     public static Materials FerriteMixture = new MaterialBuilder(612, TextureSet.SET_METALLIC, "Ferrite Mixture").addDustItems().setRGB(180, 180, 180).setColor(Dyes.dyeGray).setMaterialList(new MaterialStack(Nickel, 1), new MaterialStack(Zinc, 1), new MaterialStack(Iron, 4)).constructMaterial();
@@ -1045,6 +1046,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         YellowLimonite			.addOreByProducts(Nickel				, BrownLimonite			, Cobalt				);
         Lepidolite				.addOreByProducts(Lithium				, Caesium				, Boron					);
         Andradite				.addOreByProducts(GarnetYellow			, Iron					, Boron					);
+        Pyrolusite				.addOreByProducts(Manganese				, Tantalite             , Niobium               );
+        Phosphorus				.addOreByProducts(Apatite				, Phosphate				, Pyrochlore            );
+        Apatite					.addOreByProducts(Phosphorus			, Phosphate             , Pyrochlore            );
+        Pyrochlore              .addOreByProducts(Apatite               , Calcite               , Niobium               );
         Quartzite				.addOreByProducts(CertusQuartz			, Barite				);
         CertusQuartz			.addOreByProducts(Quartzite				, Barite				);
         BrownLimonite			.addOreByProducts(Malachite				, YellowLimonite		);
@@ -1086,7 +1091,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         Sodalite				.addOreByProducts(Lazurite				, Lapis					);
         Spodumene				.addOreByProducts(Aluminium				, Lithium				);
         Ruby					.addOreByProducts(Chrome				, GarnetRed				);
-        Phosphorus				.addOreByProducts(Apatite				, Phosphate				);
         Iridium					.addOreByProducts(Platinum				, Osmium				);
         Pyrope					.addOreByProducts(GarnetRed				, Magnesium				);
         Almandine				.addOreByProducts(GarnetRed				, Aluminium				);
@@ -1098,14 +1102,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         Salt					.addOreByProducts(RockSalt				, Borax					);
         RockSalt				.addOreByProducts(Salt					, Borax					);
         Naquadah				.addOreByProducts(NaquadahEnriched		);
-        Pyrolusite				.addOreByProducts(Manganese				);
         Molybdenite				.addOreByProducts(Molybdenum			);
         Stibnite				.addOreByProducts(Antimony				);
         Garnierite				.addOreByProducts(Nickel				);
         Lignite					.addOreByProducts(Coal					);
         Diamond					.addOreByProducts(Graphite				);
         Beryllium				.addOreByProducts(Emerald				);
-        Apatite					.addOreByProducts(Phosphorus			);
         Nikolite				.addOreByProducts(Diamond				);
         Teslatite				.addOreByProducts(Diamond				);
         Magnesite				.addOreByProducts(Magnesium				);
diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
index 9609e716..e8a96a6d 100644
--- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java
@@ -136,7 +136,7 @@ public class GT_Worldgenloader
         new GT_Worldgen_GT_Ore_Layer("ore.mix.quartz", true, 40, 80, 60, 3, 16, !tPFAA, tPFAA, false, true, true, true, Materials.Quartzite, Materials.Barite, Materials.CertusQuartz, Materials.CertusQuartz);
         new GT_Worldgen_GT_Ore_Layer("ore.mix.diamond", true, 5, 20, 40, 2, 16, !tPFAA, false, false, true, true, true, Materials.Graphite, Materials.Graphite, Materials.Diamond, Materials.Coal);
         new GT_Worldgen_GT_Ore_Layer("ore.mix.olivine", true, 10, 40, 60, 3, 16, !tPFAA, false, true, true, true, true, Materials.Bentonite, Materials.Magnesite, Materials.Olivine, Materials.Glauconite);
-        new GT_Worldgen_GT_Ore_Layer("ore.mix.apatite", true, 40, 60, 60, 3, 16, !tPFAA, false, false, false, false, false, Materials.Apatite, Materials.Apatite, Materials.Phosphorus, Materials.Phosphate);
+        new GT_Worldgen_GT_Ore_Layer("ore.mix.apatite", true, 40, 60, 60, 3, 16, !tPFAA, false, false, false, false, false, Materials.Apatite, Materials.Apatite, Materials.Phosphorus, Materials.Pyrochlore);
         new GT_Worldgen_GT_Ore_Layer("ore.mix.galena", true, 30, 60, 40, 5, 16, !tPFAA, false, false, true, true, true, Materials.Galena, Materials.Galena, Materials.Silver, Materials.Lead);
         new GT_Worldgen_GT_Ore_Layer("ore.mix.lapis", true, 20, 50, 40, 5, 16, !tPFAA, false, true, true, true, true, Materials.Lazurite, Materials.Sodalite, Materials.Lapis, Materials.Calcite);
         new GT_Worldgen_GT_Ore_Layer("ore.mix.beryllium", true, 5, 30, 30, 3, 16, !tPFAA, false, true, true, true, true, Materials.Beryllium, Materials.Beryllium, Materials.Emerald, Materials.Thorium);