diff --git a/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java b/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java
index d6086120..9511e5d7 100644
--- a/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java
+++ b/src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java
@@ -154,7 +154,7 @@ public class WorldConversionFactory {
             long sample = 0;
             int c = 0;
             int dec = 0;
-            for (int i = 0; i < 0xFFF; i++) {
+            for (int i = 0; i <= 0xFFF; i++) {
                 if (dec-- == 0) {
                     sample = bDat[c++];
                     dec = iterPerLong;
@@ -180,17 +180,13 @@ public class WorldConversionFactory {
             }
             int bId = pc[0];
             if (bId == 0) {//Its air
-                for (int i = 0; i < 0xFFF; i++) {
+                for (int i = 0; i <= 0xFFF; i++) {
                     data[i] = Mapper.airWithLight(lightSupplier.supply(i&0xF, (i>>8)&0xF, (i>>4)&0xF));
                 }
             } else {
-                for (int i = 0; i < 0xFFF; i++) {
+                for (int i = 0; i <= 0xFFF; i++) {
                     byte light = lightSupplier.supply(i&0xF, (i>>8)&0xF, (i>>4)&0xF);
-                    if (light != 0) {
-                        data[i] = Mapper.composeMappingId(light, bId, biomes[Integer.compress(i,0b1100_1100_1100)]);
-                    } else {
-                        data[i] = Mapper.AIR;
-                    }
+                    data[i] = Mapper.composeMappingId(light, bId, biomes[Integer.compress(i,0b1100_1100_1100)]);
                 }
             }
         }
diff --git a/src/main/java/me/cortex/voxy/common/world/WorldUpdater.java b/src/main/java/me/cortex/voxy/common/world/WorldUpdater.java
index 137df550..e3dc1d7c 100644
--- a/src/main/java/me/cortex/voxy/common/world/WorldUpdater.java
+++ b/src/main/java/me/cortex/voxy/common/world/WorldUpdater.java
@@ -39,16 +39,23 @@ public class WorldUpdater {
 
 
             {//Do a bunch of funny math
+                var secD = worldSection.data;
+
                 int baseVIdx = VoxelizedSection.getBaseIndexForLevel(lvl);
                 int baseSec = bx | (bz << 5) | (by << 10);
+
                 int secMsk = 0xF >> lvl;
                 secMsk |= (secMsk << 5) | (secMsk << 10);
-                var secD = worldSection.data;
-                for (int i = 0; i <= 0xFFF >> (lvl * 3); i++) {
-                    int secIdx = Integer.expand(i, secMsk)+baseSec;
-                    long newId = vdat[baseVIdx+i];
-                    long oldId = secD[secIdx]; secD[secIdx] = newId;
-                    nonAirCountDelta += (Mapper.isAir(newId)?1:0)-(Mapper.isAir(oldId)?1:0);
+                int iSecMsk1 =(~secMsk)+1;
+
+                int secIdx = 0;
+                for (int i = baseVIdx; i <= (0xFFF >> (lvl * 3)) + baseVIdx; i++) {
+                    int cSecIdx = secIdx+baseSec;
+                    secIdx = (secIdx + iSecMsk1)&secMsk;
+
+                    long newId = vdat[i];
+                    long oldId = secD[cSecIdx]; secD[cSecIdx] = newId;
+                    nonAirCountDelta += (Mapper.isAir(newId)?0:1)-(Mapper.isAir(oldId)?0:1);//its 0:1 cause its nonAir
                     didStateChange |= newId != oldId;
                 }
             }