diff --git a/kraken/KRPipelineManager.h b/kraken/KRPipelineManager.h
index 2ed5f4d..112d3dd 100644
--- a/kraken/KRPipelineManager.h
+++ b/kraken/KRPipelineManager.h
@@ -59,7 +59,6 @@ public:
     
     KRPipeline* getPipeline(KRSurface& surface, const PipelineInfo& info);
     bool selectPipeline(KRSurface& surface, KRCamera &camera, KRPipeline *pPipeline, const KRViewport &viewport, const Matrix4 &matModel, const std::vector<KRPointLight *> *point_lights, const std::vector<KRDirectionalLight *> *directional_lights, const std::vector<KRSpotLight *> *spot_lights, int bone_count, const KRNode::RenderPass &renderPass, const Vector3 &rim_color, float rim_power, const Vector4 &fade_color);
-    bool selectPipeline(KRSurface& surface, const PipelineInfo& info, const KRViewport& viewport, const Matrix4& matModel, const Vector3& rim_color, float rim_power, const Vector4& fade_color);
 
     size_t getPipelineHandlesUsed();
     
diff --git a/kraken/KRScene.cpp b/kraken/KRScene.cpp
index 482ae2b..9305caa 100755
--- a/kraken/KRScene.cpp
+++ b/kraken/KRScene.cpp
@@ -281,8 +281,9 @@ void KRScene::render(KRNode::RenderInfo& ri, KROctreeNode* pOctreeNode, unordere
                     matModel.translate(octreeBounds.center());
                     Matrix4 mvpmatrix = matModel * ri.viewport.getViewProjectionMatrix();
                     
+                    KRMeshManager::KRVBOData& vertices = getContext().getMeshManager()->KRENGINE_VBO_DATA_3D_CUBE_VERTICES;
 
-                    getContext().getMeshManager()->bindVBO(ri.commandBuffer, &getContext().getMeshManager()->KRENGINE_VBO_DATA_3D_CUBE_VERTICES, 1.0f);
+                    getContext().getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);
                     
                     PipelineInfo info{};
                     std::string shader_name("occlusion_test");
@@ -293,15 +294,16 @@ void KRScene::render(KRNode::RenderInfo& ri, KROctreeNode* pOctreeNode, unordere
                     info.spot_lights = &ri.spot_lights;
                     info.renderPass = KRNode::RENDER_PASS_FORWARD_TRANSPARENT;
                     info.rasterMode = PipelineInfo::RasterMode::kAdditive;
+                    info.vertexAttributes = vertices.getVertexAttributes();
+                    info.modelFormat = KRMesh::model_format_t::KRENGINE_MODEL_FORMAT_STRIP;
 
-                    if(getContext().getPipelineManager()->selectPipeline(*ri.surface, info, ri.viewport, matModel, Vector3::Zero(), 0.0f, Vector4::Zero())) {
-                        GLDEBUG(glDrawArrays(GL_TRIANGLE_STRIP, 0, 14));
-                        m_pContext->getMeshManager()->log_draw_call(ri.renderPass, "octree", "occlusion_test", 14);
-                    }
+                    KRPipeline* pPipeline = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
+                    pPipeline->bind(*info.pCamera, ri.viewport, matModel, info.point_lights, info.directional_lights, info.spot_lights, info.renderPass, Vector3::Zero(), 0.0f, Vector4::Zero());
+                    vkCmdDraw(ri.commandBuffer, 14, 1, 0, 0);
+                    m_pContext->getMeshManager()->log_draw_call(ri.renderPass, "octree", "occlusion_test", 14);
 
                     pOctreeNode->endOcclusionQuery();
 
-                    
                     if(bVisible) {
                         // Schedule a pass to get the result of the occlusion test only for future frames and passes, without rendering the model or recurring further
                         remainingOctreesTestResultsOnly.push_back(pOctreeNode);