diff --git a/meshers/voxel_mesher.cpp b/meshers/voxel_mesher.cpp
index 39c81f1..9ffa704 100644
--- a/meshers/voxel_mesher.cpp
+++ b/meshers/voxel_mesher.cpp
@@ -336,6 +336,7 @@ void VoxelMesher::_bake_colors(Node *p_chunk) {
 
 			float ao = (chunk->get_voxel(x, y, z, VoxelChunk::DEFAULT_CHANNEL_AO) / 255.0) * _ao_strength;
 			float rao = chunk->get_voxel(x, y, z, VoxelChunk::DEFAULT_CHANNEL_RANDOM_AO) / 255.0;
+
 			ao += rao;
 
 			light.r += _base_light_value;
diff --git a/world/voxel_chunk.cpp b/world/voxel_chunk.cpp
index 6b0125d..60664a3 100644
--- a/world/voxel_chunk.cpp
+++ b/world/voxel_chunk.cpp
@@ -544,11 +544,7 @@ void VoxelChunk::build_deferred() {
 
 		set_process_internal(true);
 
-		if (_build_thread) {
-			Thread::wait_to_finish(_build_thread);
-			memdelete(_build_thread);
-			_build_thread = NULL;
-		}
+		wait_and_finish_thread();
 
 		_is_generating = true;
 
@@ -562,35 +558,44 @@ void VoxelChunk::build_prioritized() {
 
 		set_process_internal(true);
 
-		if (_build_thread) {
-			Thread::wait_to_finish(_build_thread);
-			memdelete(_build_thread);
-			_build_thread = NULL;
-		}
+		wait_and_finish_thread();
 
 		_is_generating = true;
 
 		next_phase();
+		_build_step();
 	}
 }
 
 void VoxelChunk::_build_step() {
-	if (_build_prioritized)
-		build_phase();
+	ERR_FAIL_COND(!has_next_phase());
 
 	if (_is_build_threaded) {
-		ERR_FAIL_COND(_build_thread != NULL);
+		if (is_phase_threaded(get_current_build_phase())) {
+			ERR_FAIL_COND(_build_thread != NULL);
 
-		_build_thread = Thread::create(_build_threaded, this);
+			_build_thread = Thread::create(_build_threaded, this);
+		} else {
+			if (has_next_phase())
+				build_phase();
+		}
 	} else {
-		build_phase();
+		while (is_phase_threaded(get_current_build_phase()) && has_next_phase()) {
+			build_phase();
+		}
+
+		//call the next non-threaded phase aswell
+		if (has_next_phase())
+			build_phase();
 	}
 }
 
 void VoxelChunk::_build_threaded(void *_userdata) {
 	VoxelChunk *vc = (VoxelChunk *)_userdata;
 
-	vc->build_phase();
+	while (vc->is_phase_threaded(vc->get_current_build_phase()) && vc->has_next_phase()) {
+		vc->build_phase();
+	}
 }
 
 void VoxelChunk::build_phase() {
@@ -624,20 +629,14 @@ void VoxelChunk::_build_phase(int phase) {
 			return;
 		}
 		case BUILD_PHASE_TERRARIN_MESH_SETUP: {
-			if (has_method("_create_mesh")) {
-				call("_create_mesh");
-			} else {
-				for (int i = 0; i < _meshers.size(); ++i) {
-					Ref<VoxelMesher> mesher = _meshers.get(i);
+			for (int i = 0; i < _meshers.size(); ++i) {
+				Ref<VoxelMesher> mesher = _meshers.get(i);
 
-					ERR_CONTINUE(!mesher.is_valid());
+				ERR_CONTINUE(!mesher.is_valid());
 
-					mesher->add_chunk(this);
-				}
+				mesher->add_chunk(this);
 			}
 
-			//finalize_mesh();
-
 			next_phase();
 
 			return;
@@ -733,7 +732,7 @@ void VoxelChunk::_build_phase(int phase) {
 		}
 	}
 
-	next_phase();
+	//next_phase();
 }
 
 bool VoxelChunk::has_next_phase() {
@@ -765,6 +764,25 @@ void VoxelChunk::next_phase() {
 	}
 }
 
+bool VoxelChunk::is_phase_threaded(int phase) {
+	return call("_is_phase_threaded", phase);
+}
+bool VoxelChunk::_is_phase_threaded(int phase) {
+	switch (phase) {
+		case BUILD_PHASE_SETUP:
+		case BUILD_PHASE_TERRARIN_MESH_SETUP:
+		case BUILD_PHASE_TERRARIN_MESH_COLLIDER:
+		//case BUILD_PHASE_LIGHTS:
+		case BUILD_PHASE_TERRARIN_MESH:
+		//case BUILD_PHASE_PROP_MESH:
+		case BUILD_PHASE_PROP_COLLIDER:
+		case BUILD_PHASE_FINALIZE:
+			return true;
+	}
+
+	return false;
+}
+
 void VoxelChunk::clear() {
 	_voxel_lights.clear();
 }
@@ -1300,41 +1318,46 @@ void VoxelChunk::_notification(int p_what) {
 			if (_build_thread) {
 				_abort_build = true;
 
-				Thread::wait_to_finish(_build_thread);
-				memdelete(_build_thread);
-				_build_thread = NULL;
+				wait_and_finish_thread();
 			}
 		}
 		case NOTIFICATION_INTERNAL_PROCESS: {
-			if (_build_prioritized) {
-				while (has_next_phase() && _build_phase_done) {
-					build_phase();
-				}
+			//if (_build_prioritized) {
+			//while (has_next_phase() && _build_phase_done) {
+			//	_build_step();
+			//	wait_and_finish_thread();
+			//}
 
-				return;
-			}
+			//	return;
+			//}
 
 			if (has_next_phase() && _build_phase_done) {
-				if (_build_thread) {
-					Thread::wait_to_finish(_build_thread);
-					memdelete(_build_thread);
-					_build_thread = NULL;
-				}
+				wait_and_finish_thread();
 
-				build_phase();
+				_build_step();
 			}
 		}
 	}
 }
 
+void VoxelChunk::wait_and_finish_thread() {
+	if (_build_thread) {
+		Thread::wait_to_finish(_build_thread);
+		memdelete(_build_thread);
+		_build_thread = NULL;
+	}
+}
+
 void VoxelChunk::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("mesh_generation_finished", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk")));
 
-	BIND_VMETHOD(MethodInfo("_create_mesh"));
-	BIND_VMETHOD(MethodInfo("_create_meshers"));
+	BIND_VMETHOD(MethodInfo("_is_phase_threaded", PropertyInfo(Variant::INT, "phase")));
+	ClassDB::bind_method(D_METHOD("is_phase_threaded", "phase"), &VoxelChunk::is_phase_threaded);
+	ClassDB::bind_method(D_METHOD("_is_phase_threaded", "phase"), &VoxelChunk::_is_phase_threaded);
 
 	BIND_VMETHOD(MethodInfo("_prop_added", PropertyInfo(Variant::OBJECT, "prop", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunkPropData")));
 
+	BIND_VMETHOD(MethodInfo("_create_meshers"));
 	ClassDB::bind_method(D_METHOD("_create_meshers"), &VoxelChunk::_create_meshers);
 
 	ClassDB::bind_method(D_METHOD("get_is_generating"), &VoxelChunk::get_is_generating);
diff --git a/world/voxel_chunk.h b/world/voxel_chunk.h
index e73ce85..c4d2cfd 100644
--- a/world/voxel_chunk.h
+++ b/world/voxel_chunk.h
@@ -227,6 +227,8 @@ public:
 	void _build_phase(int phase);
 	bool has_next_phase();
 	void next_phase();
+	bool is_phase_threaded(int phase);
+	bool _is_phase_threaded(int phase);
 
 	void clear();
 
@@ -296,6 +298,8 @@ public:
 	~VoxelChunk();
 
 protected:
+	void wait_and_finish_thread();
+
 	void _notification(int p_what);
 	static void _bind_methods();