diff --git a/Construct [BP]/scripts/classes/Instance/StructureInstance.js b/Construct [BP]/scripts/classes/Instance/StructureInstance.js
index 7cc9693..c5fd573 100644
--- a/Construct [BP]/scripts/classes/Instance/StructureInstance.js	
+++ b/Construct [BP]/scripts/classes/Instance/StructureInstance.js	
@@ -114,7 +114,7 @@ export class StructureInstance {
         if (!this.options.isEnabled)
             throw new InstanceNotPlacedError(`[Construct] Instance '${this.options.instanceName}' is not placed.`);
         if (this.hasLayerSelected())
-            return this.getLayerBlocks(this.getLayer());
+            return this.getLayerBlocks(this.getLayer() - 1);
         return this.getAllBlocks();
     }
 
diff --git a/Construct [BP]/scripts/data.js b/Construct [BP]/scripts/data.js
index ccb7b80..53038d0 100644
--- a/Construct [BP]/scripts/data.js	
+++ b/Construct [BP]/scripts/data.js	
@@ -36,7 +36,8 @@ export const resetToBlockStates = {
     cluster_count: 0,
     respawn_anchor_charge: 0,
     turtle_egg_count: 0,
-    cluster_count: 0
+    cluster_count: 0,
+    end_portal_eye_bit: false
 };
 
 export const blockIdToItemStackMap = {
diff --git a/Construct [BP]/structures/EndPortalRoom1.mcstructure b/Construct [BP]/structures/EndPortalRoom1.mcstructure
new file mode 100644
index 0000000..fc16428
Binary files /dev/null and b/Construct [BP]/structures/EndPortalRoom1.mcstructure differ
diff --git a/Construct [BP]/structures/EndPortalRoom2.mcstructure b/Construct [BP]/structures/EndPortalRoom2.mcstructure
new file mode 100644
index 0000000..bd410a6
Binary files /dev/null and b/Construct [BP]/structures/EndPortalRoom2.mcstructure differ
diff --git a/Construct [BP]/structures/EndPortalRoom3.mcstructure b/Construct [BP]/structures/EndPortalRoom3.mcstructure
new file mode 100644
index 0000000..222cb08
Binary files /dev/null and b/Construct [BP]/structures/EndPortalRoom3.mcstructure differ
diff --git a/Construct [BP]/structures/EndPortalRoom4.mcstructure b/Construct [BP]/structures/EndPortalRoom4.mcstructure
new file mode 100644
index 0000000..4162173
Binary files /dev/null and b/Construct [BP]/structures/EndPortalRoom4.mcstructure differ
diff --git a/Construct [BP]/structures/Everything.mcstructure b/Construct [BP]/structures/Everything.mcstructure
deleted file mode 100644
index 5eb8d95..0000000
Binary files a/Construct [BP]/structures/Everything.mcstructure and /dev/null differ
diff --git a/Construct [BP]/structures/xmas.mcstructure b/Construct [BP]/structures/xmas.mcstructure
deleted file mode 100644
index 0c4dde8..0000000
Binary files a/Construct [BP]/structures/xmas.mcstructure and /dev/null differ