diff --git a/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java b/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
index 1779ef6..b4e57c3 100644
--- a/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
+++ b/src/main/java/net/lax1dude/eaglercraft/glemu/EaglerAdapterGL30.java
@@ -1375,7 +1375,7 @@ public class EaglerAdapterGL30 extends EaglerAdapterImpl2 {
 
 	public static final boolean glGetQueryResultAvailable(int obj) {
 		QueryGL q = queryObjs.get(obj);
-		return _wglGetQueryObjecti(q, _wGL_QUERY_RESULT_AVAILABLE) >= 0;
+		return _wglGetQueryObjecti(q, _wGL_QUERY_RESULT_AVAILABLE) > 0;
 	}
 
 	public static final int glGenTextures() {
diff --git a/src/main/java/net/minecraft/src/GLAllocation.java b/src/main/java/net/minecraft/src/GLAllocation.java
index 1d063b1..74f351d 100644
--- a/src/main/java/net/minecraft/src/GLAllocation.java
+++ b/src/main/java/net/minecraft/src/GLAllocation.java
@@ -20,7 +20,7 @@ public class GLAllocation {
 	/**
 	 * Generates the specified number of display lists and returns the first index.
 	 */
-	public static synchronized int generateDisplayLists(int par0) {
+	public static int generateDisplayLists(int par0) {
 		int var1 = EaglerAdapter.glGenLists(par0);
 		field_74531_a.put(Integer.valueOf(var1), Integer.valueOf(par0));
 		return var1;
@@ -29,17 +29,17 @@ public class GLAllocation {
 	/**
 	 * Generates texture names and stores them in the specified buffer.
 	 */
-	public static synchronized int generateTextureNames() {
+	public static int generateTextureNames() {
 		int var0 = EaglerAdapter.glGenTextures();
 		field_74530_b.add(Integer.valueOf(var0));
 		return var0;
 	}
 
-	public static synchronized void deleteDisplayLists(int par0) {
+	public static void deleteDisplayLists(int par0) {
 		EaglerAdapter.glDeleteLists(par0, ((Integer) field_74531_a.remove(Integer.valueOf(par0))).intValue());
 	}
 
-	public static synchronized void func_98302_b() {
+	public static void func_98302_b() {
 		for (int var0 = 0; var0 < field_74530_b.size(); ++var0) {
 			EaglerAdapter.glDeleteTextures(((Integer) field_74530_b.get(var0)).intValue());
 		}
@@ -51,7 +51,7 @@ public class GLAllocation {
 	 * Deletes all textures and display lists. Called when Minecraft is shutdown to
 	 * free up resources.
 	 */
-	public static synchronized void deleteTexturesAndDisplayLists() {
+	public static void deleteTexturesAndDisplayLists() {
 		Iterator var0 = field_74531_a.entrySet().iterator();
 
 		while (var0.hasNext()) {
diff --git a/src/main/java/net/minecraft/src/RenderGlobal.java b/src/main/java/net/minecraft/src/RenderGlobal.java
index 671ea86..6444d84 100644
--- a/src/main/java/net/minecraft/src/RenderGlobal.java
+++ b/src/main/java/net/minecraft/src/RenderGlobal.java
@@ -156,8 +156,6 @@ public class RenderGlobal implements IWorldAccess {
 		for(int i = 0; i < glOcclusionQuery.length; ++i) {
 			this.glOcclusionQuery[i] = -1;
 		}
-		this.occlusionQueryAvailable = new boolean[glOcclusionQuery.length];
-		this.occlusionQueryStalled = new long[occlusionQueryAvailable.length];
 		this.starGLCallList = GLAllocation.generateDisplayLists(3);
 		EaglerAdapter.glPushMatrix();
 		EaglerAdapter.glNewList(this.starGLCallList, EaglerAdapter.GL_COMPILE);
@@ -321,8 +319,7 @@ public class RenderGlobal implements IWorldAccess {
 						int i = (var6 * this.renderChunksTall + var5) * this.renderChunksWide + var4;
 						this.worldRenderers[i] = new WorldRenderer(this.theWorld, this.tileEntities, var4 * 16, var5 * 16, var6 * 16, this.glRenderListBase + var2);
 						this.worldRenderers[i].isWaitingOnOcclusionQuery = false;
-						this.worldRenderers[i].isNowVisible = true;
-						this.worldRenderers[i].isVisible = 100;
+						this.worldRenderers[i].isVisible = true;
 						this.worldRenderers[i].isInFrustum = true;
 						this.worldRenderers[i].chunkIndex = var3++;
 						this.worldRenderers[i].markDirty();
@@ -505,11 +502,7 @@ public class RenderGlobal implements IWorldAccess {
 		}
 	}
 
-	// GOSH FUCKING DAMMIT WHY IN THE FUCK IS GODDAMN WEBGL THIS UNSTABLE
-	
 	private long lastOcclusionQuery = 0l;
-	private boolean[] occlusionQueryAvailable;
-	private long[] occlusionQueryStalled;
 
 	/**
 	 * Sorts all renderers based on the passed in entity. Args: entityLiving,
@@ -568,9 +561,6 @@ public class RenderGlobal implements IWorldAccess {
 		int var34;
 
 		long queryRate = 50l;
-		long stallRateVisible = 60l;
-		long stallRate = 500l;
-		int cooldownRate = 13;
 
 		long ct = EaglerAdapter.steadyTimeMillis();
 		if(par2 == 0) {
@@ -581,35 +571,13 @@ public class RenderGlobal implements IWorldAccess {
 				int ccy = c.chunkY - fy;
 				int ccz = c.chunkZ - fz;
 				boolean forced = ccx < 2 && ccx > -2 && ccy < 2 && ccy > -2 && ccz < 2 && ccz > -2;
-				if(forced) {
-					c.hasOcclusionData = 5;
-				}
-				if(forced || glOcclusionQuery[c.chunkIndex] == -1) {
-					c.isNowVisible = true;
-					c.isVisible = cooldownRate;
-				}else if(occlusionQueryAvailable[c.chunkIndex]) {
-					if(EaglerAdapter.glGetQueryResultAvailable(glOcclusionQuery[c.chunkIndex])) {
-						if(EaglerAdapter.glGetQueryResult(glOcclusionQuery[c.chunkIndex])) {
-							c.isNowVisible = true;
-							++c.hasOcclusionData;
-							if(c.hasOcclusionData > 5) {
-								c.hasOcclusionData = 5;
-							}
-							c.isVisible = cooldownRate;
-						}else {
-							if(c.isVisible <= 0) {
-								c.isNowVisible = false;
-								--c.hasOcclusionData;
-								if(c.hasOcclusionData < 0) {
-									c.hasOcclusionData = 0;
-								}
-							}
-						}
-						occlusionQueryAvailable[c.chunkIndex] = false;
-						occlusionQueryStalled[c.chunkIndex] = 0l;
-					}else if(occlusionQueryStalled[c.chunkIndex] != 0l && ct - occlusionQueryStalled[c.chunkIndex] > stallRateVisible) {
-						c.isNowVisible = true;
-						c.isVisible = cooldownRate;
+				if(forced || c.chunkIndex == -1) {
+					c.isVisible = true;
+				}else if(c.isWaitingOnOcclusionQuery) {
+					int j = glOcclusionQuery[c.chunkIndex];
+					if(EaglerAdapter.glGetQueryResultAvailable(j)) {
+						c.isVisible = EaglerAdapter.glGetQueryResult(j);
+						c.isWaitingOnOcclusionQuery = false;
 					}
 				}
 			}
@@ -663,17 +631,8 @@ public class RenderGlobal implements IWorldAccess {
 					}
 				}
 				if(shouldTry && !(ccx < 2 && ccx > -2 && ccy < 2 && ccy > -2 && ccz < 2 && ccz > -2)) {
-					boolean stalled = false;
-					if(occlusionQueryAvailable[c.chunkIndex]) {
-						if(occlusionQueryStalled[c.chunkIndex] == 0l) {
-							occlusionQueryStalled[c.chunkIndex] = ct;
-							stalled = true;
-						}else if(ct - occlusionQueryStalled[c.chunkIndex] < stallRate) {
-							stalled = true;
-						}
-					}
-					if(!stalled) {
-						occlusionQueryAvailable[c.chunkIndex] = true;
+					if(!c.isWaitingOnOcclusionQuery) {
+						c.isWaitingOnOcclusionQuery = true;
 						int q = glOcclusionQuery[c.chunkIndex];
 						if(q == -1) {
 							q = glOcclusionQuery[c.chunkIndex] = EaglerAdapter.glCreateQuery();
@@ -682,14 +641,6 @@ public class RenderGlobal implements IWorldAccess {
 						EaglerAdapter.glDrawOcclusionBB((float)(c.posX - var33), (float)(c.posY - var7), (float)(c.posZ - var9), 16, 16, 16);
 						EaglerAdapter.glEndQuery();
 					}
-				}else {
-					--c.hasOcclusionData;
-					if(c.hasOcclusionData < 0) {
-						c.hasOcclusionData = 0;
-					}
-				}
-				if(c.isVisible > 0) {
-					--c.isVisible;
 				}
 			}
 			EaglerAdapter.glEndOcclusionBB();
@@ -718,14 +669,14 @@ public class RenderGlobal implements IWorldAccess {
 					++this.renderersSkippingRenderPass;
 				} else if (!this.sortedWorldRenderers[var7].isInFrustum) {
 					++this.renderersBeingClipped;
-				} else if(!this.sortedWorldRenderers[var7].isNowVisible) {
+				} else if(!this.sortedWorldRenderers[var7].isVisible) {
 					++this.renderersBeingOccluded;
 				} else {
 					++this.renderersBeingRendered;
 				}
 			}
 
-			if (!this.sortedWorldRenderers[var7].skipRenderPass[par3] && this.sortedWorldRenderers[var7].isInFrustum && this.sortedWorldRenderers[var7].isNowVisible) {
+			if (!this.sortedWorldRenderers[var7].skipRenderPass[par3] && this.sortedWorldRenderers[var7].isInFrustum && this.sortedWorldRenderers[var7].isVisible) {
 				int var8 = this.sortedWorldRenderers[var7].getGLCallListForPass(par3);
 
 				if (var8 >= 0) {
@@ -1277,7 +1228,7 @@ public class RenderGlobal implements IWorldAccess {
 			var10 = (WorldRenderer) this.worldRenderersToUpdate.get(var9);
 
 			if (var10 != null) {
-				if (!var10.isInFrustum || !var10.isNowVisible || var10.hasOcclusionData < 3) { // config?
+				if (!var10.isInFrustum || !var10.isVisible) {
 					laterUpdateList.add(var10);
 				}else {
 					if (var6 == null) {
diff --git a/src/main/java/net/minecraft/src/WorldRenderer.java b/src/main/java/net/minecraft/src/WorldRenderer.java
index 71b59ea..c164e89 100644
--- a/src/main/java/net/minecraft/src/WorldRenderer.java
+++ b/src/main/java/net/minecraft/src/WorldRenderer.java
@@ -64,8 +64,7 @@ public class WorldRenderer {
 	public int chunkIndex;
 
 	/** Is this renderer visible according to the occlusion query */
-	public int isVisible = 0;
-	public boolean isNowVisible = true;
+	public boolean isVisible = true;
 
 	/** Is this renderer waiting on the result of the occlusion query */
 	public boolean isWaitingOnOcclusionQuery;
@@ -73,7 +72,6 @@ public class WorldRenderer {
 	/** Is the chunk lit */
 	public boolean isChunkLit;
 	private boolean isInitialized = false;
-	public int hasOcclusionData = 0;
 
 	/** All the tile entities that have special rendering code for this chunk */
 	public List tileEntityRenderers = new ArrayList();
@@ -98,7 +96,6 @@ public class WorldRenderer {
 	public void setPosition(int par1, int par2, int par3) {
 		if (par1 != this.posX || par2 != this.posY || par3 != this.posZ) {
 			this.setDontDraw();
-			this.hasOcclusionData = 0;
 			this.posX = par1;
 			this.posY = par2;
 			this.posZ = par3;