diff --git a/core/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java b/core/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
index 81867bccc..362a3ea69 100644
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java
@@ -43,15 +43,7 @@ public class IrisCeilingDecorator extends IrisEngineDecorator {
         IrisDecorator decorator = getDecorator(biome, realX, realZ);
         if (decorator != null) {
             if (!decorator.isStacking()) {
-                if (height >= 0 || height < getEngine().getHeight()) {
-                    if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                        height--;
-                        data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                    } else {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                    }
-                }
+                data.set(x, height, z, fixFaces(decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()), realX, height, realZ));
             } else {
                 int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
                 if (decorator.isScaleStack()) {
diff --git a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
index 4042a5f63..e1b2fac7b 100644
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java
@@ -44,15 +44,7 @@ public class IrisSeaFloorDecorator extends IrisEngineDecorator {
                     return;
                 }
                 if (height >= 0 || height < getEngine().getHeight()) {
-                    if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                        if (height == getDimension().getFluidHeight() - 1) {
-                            data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                            height++;
-                            data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                        }
-                    } else {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                    }
+                    data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
                 }
             } else {
                 int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
diff --git a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
index 6d86af362..8bf9b6e49 100644
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java
@@ -40,13 +40,7 @@ public class IrisSeaSurfaceDecorator extends IrisEngineDecorator {
         if (decorator != null) {
             if (!decorator.isStacking()) {
                 if (height >= 0 || height < getEngine().getHeight()) {
-                    if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                        height++;
-                        data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                    } else {
-                        data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                    }
+                    data.set(x, height + 1, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
                 }
             } else {
                 int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
diff --git a/core/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java b/core/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
index 6585f0a40..88223b017 100644
--- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
+++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java
@@ -51,13 +51,7 @@ public class IrisShoreLineDecorator extends IrisEngineDecorator {
                     }
 
                     if (!decorator.isStacking()) {
-                        if (null != decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData())) {
-                            data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                            height++;
-                            data.set(x, height, z, decorator.getBlockDataForTop(biome, getRng(), realX, height, realZ, getData()));
-                        } else {
-                            data.set(x, height, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
-                        }
+                        data.set(x, height + 1, z, decorator.getBlockData100(biome, getRng(), realX, height, realZ, getData()));
                     } else {
                         int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData());
                         if (decorator.isScaleStack()) {