diff --git a/src/main/java/com/hbm/main/StructureManager.java b/src/main/java/com/hbm/main/StructureManager.java
index f34d7722f..a895048d1 100644
--- a/src/main/java/com/hbm/main/StructureManager.java
+++ b/src/main/java/com/hbm/main/StructureManager.java
@@ -56,7 +56,8 @@ public class StructureManager {
 
 	public static final NBTStructure vertibird = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/vertibird.nbt"));
 	public static final NBTStructure crashed_vertibird = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/crashed-vertibird.nbt"));
-	public static final NBTStructure aircraft = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/AircraftCarrier.nbt"));
+	public static final NBTStructure aircraft_carrier = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/aircraft_carrier.nbt"));
+//	public static final NBTStructure oilrig = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/oilrig.nbt"));
 	// public static final NBTStructure test_rot = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/test-rot.nbt"));
 	// public static final NBTStructure test_jigsaw = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/test-jigsaw.nbt"));
 	// public static final NBTStructure test_jigsaw_core = new NBTStructure(new ResourceLocation(RefStrings.MODID, "structures/test-jigsaw-core.nbt"));
diff --git a/src/main/java/com/hbm/world/gen/NTMWorldGenerator.java b/src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
index b444188d2..da4a7e8fd 100644
--- a/src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
+++ b/src/main/java/com/hbm/world/gen/NTMWorldGenerator.java
@@ -64,11 +64,18 @@ public class NTMWorldGenerator implements IWorldGenerator {
 
 		NBTStructure.registerStructure(0, new SpawnCondition() {{
 			canSpawn = oceanBiomes::contains;
-			structure = new JigsawPiece("aircraft", StructureManager.aircraft);
+			structure = new JigsawPiece("aircraft_carrier", StructureManager.aircraft_carrier);
 			maxHeight = 46;
-			spawnWeight = 75 * 5;
+			spawnWeight = 1;
 		}});
 
+//		NBTStructure.registerStructure(0, new SpawnCondition() {{
+//			canSpawn = oceanBiomes::contains;
+//			structure = new JigsawPiece("oilrig", StructureManager.oilrig);
+//			maxHeight = 56;
+//			spawnWeight = 5 * 5;
+//		}});
+
 		Map<Block, BlockSelector> bricks = new HashMap<Block, BlockSelector>() {{
 			put(ModBlocks.meteor_brick, new MeteorBricks());
 		}};
diff --git a/src/main/resources/assets/hbm/structures/AircraftCarrier.nbt b/src/main/resources/assets/hbm/structures/AircraftCarrier.nbt
deleted file mode 100644
index 3902285e4..000000000
Binary files a/src/main/resources/assets/hbm/structures/AircraftCarrier.nbt and /dev/null differ
diff --git a/src/main/resources/assets/hbm/structures/aircraft_carrier.nbt b/src/main/resources/assets/hbm/structures/aircraft_carrier.nbt
new file mode 100644
index 000000000..bd7071830
Binary files /dev/null and b/src/main/resources/assets/hbm/structures/aircraft_carrier.nbt differ