diff --git a/kraken/KRAmbientZone.cpp b/kraken/KRAmbientZone.cpp
index e9cc8a4..b7fbb60 100755
--- a/kraken/KRAmbientZone.cpp
+++ b/kraken/KRAmbientZone.cpp
@@ -145,7 +145,7 @@ void KRAmbientZone::render(RenderInfo& ri)
           info.vertexAttributes = sphereModel->getVertexAttributes();
         
           KRPipeline *pPipeline = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
-          pPipeline->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+          pPipeline->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 
           sphereModel->renderNoMaterials(ri.commandBuffer, ri.renderPass, getName(), "visualize_overlay", 1.0f);
         } // sphereModel
diff --git a/kraken/KRAudioSource.cpp b/kraken/KRAudioSource.cpp
index 93d38ac..c13002f 100755
--- a/kraken/KRAudioSource.cpp
+++ b/kraken/KRAudioSource.cpp
@@ -211,7 +211,7 @@ void KRAudioSource::render(RenderInfo& ri)
         info.vertexAttributes = sphereModel->getVertexAttributes();
 
         KRPipeline* pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
-        pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+        pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 
         sphereModel->renderNoMaterials(ri.commandBuffer, ri.renderPass, getName(), "visualize_overlay", 1.0f);
       } // sphereModels.size()
diff --git a/kraken/KRBone.cpp b/kraken/KRBone.cpp
index ec1031e..fec7d72 100755
--- a/kraken/KRBone.cpp
+++ b/kraken/KRBone.cpp
@@ -95,7 +95,7 @@ void KRBone::render(RenderInfo& ri)
           info.vertexAttributes = sphereModel->getVertexAttributes();
 
           KRPipeline *pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
-          pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+          pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 
           sphereModel->renderNoMaterials(ri.commandBuffer, ri.renderPass, getName(), "visualize_overlay", 1.0f);
         } // sphereModel
diff --git a/kraken/KRCamera.cpp b/kraken/KRCamera.cpp
index a5578b7..c57b4e5 100755
--- a/kraken/KRCamera.cpp
+++ b/kraken/KRCamera.cpp
@@ -231,7 +231,7 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS
           info.vertexAttributes = sphereMesh->getVertexAttributes();
           info.modelFormat = sphereMesh->getModelFormat();
           KRPipeline* testPipeline = m_pContext->getPipelineManager()->getPipeline(compositeSurface, info);
-          testPipeline->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_OPAQUE, Vector3::Zero(), 0.0f);
+          testPipeline->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_OPAQUE);
           sphereMesh->renderNoMaterials(commandBuffer, info.renderPass, "Vulkan Test", "vulkan_test", 1.0);
         }
 
@@ -260,7 +260,7 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS
         info.cullMode = CullMode::kCullNone;
 
         KRPipeline* pPipeline = getContext().getPipelineManager()->getPipeline(compositeSurface, info);
-        pPipeline->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_OPAQUE, Vector3::Zero(), 0.0f);
+        pPipeline->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_OPAQUE);
 
         getContext().getTextureManager()->selectTexture(0, m_pSkyBoxTexture, 0.0f, KRTexture::TEXTURE_USAGE_SKY_CUBE);
         
@@ -354,7 +354,7 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS
             Matrix4 matModel = Matrix4();
             matModel.scale((*itr).first.size() * 0.5f);
             matModel.translate((*itr).first.center());
-            pVisShader->bind(commandBuffer, *this, m_viewport, matModel, nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_TRANSPARENT, Vector3::Zero(), 0.0f);
+            pVisShader->bind(commandBuffer, *this, m_viewport, matModel, nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_TRANSPARENT);
             vkCmdDraw(commandBuffer, 14, 1, 0, 0);
         }
     }
@@ -573,7 +573,7 @@ void KRCamera::renderPost(VkCommandBuffer& commandBuffer, KRSurface& surface)
     KRPipeline *postShader = m_pContext->getPipelineManager()->getPipeline(surface, info);
     
     postShader->setUniform(KRPipeline::KRENGINE_UNIFORM_FADE_COLOR, m_fade_color);
-    postShader->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_TRANSPARENT, Vector3::Zero(), 0.0f);
+    postShader->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_TRANSPARENT);
     
     m_pContext->getTextureManager()->selectTexture(GL_TEXTURE_2D, 0, compositeDepthTexture);
     m_pContext->getTextureManager()->selectTexture(GL_TEXTURE_2D, 1, compositeColorTexture);
@@ -748,7 +748,7 @@ void KRCamera::renderPost(VkCommandBuffer& commandBuffer, KRSurface& surface)
         info.vertexAttributes = (1 << KRMesh::KRENGINE_ATTRIB_VERTEX) | (1 << KRMesh::KRENGINE_ATTRIB_TEXUVA);
         info.modelFormat = ModelFormat::KRENGINE_MODEL_FORMAT_TRIANGLES;
         KRPipeline *fontShader = m_pContext->getPipelineManager()->getPipeline(surface, info);
-        fontShader->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_TRANSPARENT, Vector3::Zero(), 0.0f);
+        fontShader->bind(commandBuffer, *this, m_viewport, Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_FORWARD_TRANSPARENT);
         
         m_pContext->getTextureManager()->selectTexture(0, m_pContext->getTextureManager()->getTexture("font"), 0.0f, KRTexture::TEXTURE_USAGE_UI);
         
diff --git a/kraken/KRCollider.cpp b/kraken/KRCollider.cpp
index 451fc13..3a57378 100755
--- a/kraken/KRCollider.cpp
+++ b/kraken/KRCollider.cpp
@@ -219,7 +219,7 @@ void KRCollider::render(RenderInfo& ri)
 
             KRPipeline *pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
 
-            pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+            pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
             
             m_model->renderNoMaterials(ri.commandBuffer, ri.renderPass, getName(), "visualize_overlay", 1.0f);
             
diff --git a/kraken/KRDirectionalLight.cpp b/kraken/KRDirectionalLight.cpp
index bfa844e..7f838fe 100755
--- a/kraken/KRDirectionalLight.cpp
+++ b/kraken/KRDirectionalLight.cpp
@@ -155,7 +155,7 @@ void KRDirectionalLight::render(RenderInfo& ri) {
         pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_DIRECTION_VIEW_SPACE, light_direction_view_space);
         pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_COLOR, m_color);
         pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_INTENSITY, m_intensity * 0.01f);
-        pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), nullptr, &this_light, nullptr, ri.renderPass, Vector3::Zero(), 0.0f);
+        pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), nullptr, &this_light, nullptr, ri.renderPass);
             
         // Render a full screen quad
         m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);
diff --git a/kraken/KRLight.cpp b/kraken/KRLight.cpp
index b6cddef..ace4f07 100755
--- a/kraken/KRLight.cpp
+++ b/kraken/KRLight.cpp
@@ -273,7 +273,7 @@ void KRLight::render(RenderInfo& ri) {
                 pParticleShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_COLOR, m_color * ri.camera->settings.dust_particle_intensity * m_dust_particle_intensity * m_intensity);
                 pParticleShader->setUniform(KRPipeline::KRENGINE_UNIFORM_PARTICLE_ORIGIN, Matrix4::DotWDiv(Matrix4::Invert(particleModelMatrix), Vector3::Zero()));
                 pParticleShader->setUniform(KRPipeline::KRENGINE_UNIFORM_FLARE_SIZE, m_dust_particle_size);
-                pParticleShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, particleModelMatrix, &this_point_light, &this_directional_light, &this_spot_light, ri.renderPass, Vector3::Zero(), 0.0f);
+                pParticleShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, particleModelMatrix, &this_point_light, &this_directional_light, &this_spot_light, ri.renderPass);
                     
                 KRDataBlock particle_index_data;
                 m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, m_pContext->getMeshManager()->getRandomParticles(), particle_index_data, (1 << KRMesh::KRENGINE_ATTRIB_VERTEX) | (1 << KRMesh::KRENGINE_ATTRIB_TEXUVA), true, 1.0f
@@ -328,7 +328,7 @@ void KRLight::render(RenderInfo& ri) {
             
         pFogShader->setUniform(KRPipeline::KRENGINE_UNIFORM_SLICE_DEPTH_SCALE, Vector2::Create(slice_near, slice_spacing));
         pFogShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_COLOR, (m_color * ri.camera->settings.volumetric_environment_intensity * m_intensity * -slice_spacing / 1000.0f));
-        pFogShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, Matrix4(), &this_point_light, &this_directional_light, &this_spot_light, KRNode::RENDER_PASS_VOLUMETRIC_EFFECTS_ADDITIVE, Vector3::Zero(), 0.0f);
+        pFogShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, Matrix4(), &this_point_light, &this_directional_light, &this_spot_light, KRNode::RENDER_PASS_VOLUMETRIC_EFFECTS_ADDITIVE);
             
         KRDataBlock index_data;
         m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, m_pContext->getMeshManager()->getVolumetricLightingVertexes(), index_data, (1 << KRMesh::KRENGINE_ATTRIB_VERTEX), true, 1.0f
@@ -366,7 +366,7 @@ void KRLight::render(RenderInfo& ri) {
               info.vertexAttributes = sphereModel->getVertexAttributes();
 
               KRPipeline* pPipeline = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
-              pPipeline->bind(ri.commandBuffer, *info.pCamera, ri.viewport, occlusion_test_sphere_matrix, info.point_lights, info.directional_lights, info.spot_lights, info.renderPass, Vector3::Zero(), 0.0f);
+              pPipeline->bind(ri.commandBuffer, *info.pCamera, ri.viewport, occlusion_test_sphere_matrix, info.point_lights, info.directional_lights, info.spot_lights, info.renderPass);
 
               GLDEBUG(glGenQueriesEXT(1, &m_occlusionQuery));
   #if TARGET_OS_IPHONE || defined(ANDROID)
@@ -422,7 +422,7 @@ void KRLight::render(RenderInfo& ri) {
                         KRPipeline *pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
                         pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_MATERIAL_ALPHA, 1.0f);
                         pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_FLARE_SIZE, m_flareSize);
-                        pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+                        pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 
                         m_pContext->getTextureManager()->selectTexture(0, m_pFlareTexture, 0.0f, KRTexture::TEXTURE_USAGE_LIGHT_FLARE);
                         m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);
@@ -532,7 +532,7 @@ void KRLight::renderShadowBuffers(RenderInfo& ri)
             info.cullMode = CullMode::kCullNone; // Disabling culling, which eliminates some self-cast shadow artifacts
             KRPipeline *shadowShader = m_pContext->getPipelineManager()->getPipeline(*ri.surface, info);
 
-            shadowShader->bind(ri.commandBuffer, *ri.camera, m_shadowViewports[iShadow], Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_SHADOWMAP, Vector3::Zero(), 0.0f);
+            shadowShader->bind(ri.commandBuffer, *ri.camera, m_shadowViewports[iShadow], Matrix4(), nullptr, nullptr, nullptr, KRNode::RENDER_PASS_SHADOWMAP);
             
             getScene().render(ri.commandBuffer, *ri.surface, ri.camera, m_shadowViewports[iShadow].getVisibleBounds(), m_shadowViewports[iShadow], KRNode::RENDER_PASS_SHADOWMAP, true);
         }
diff --git a/kraken/KRMaterial.cpp b/kraken/KRMaterial.cpp
index f6360a2..475f71e 100755
--- a/kraken/KRMaterial.cpp
+++ b/kraken/KRMaterial.cpp
@@ -351,6 +351,10 @@ void KRMaterial::bind(const KRNode::RenderInfo& ri, ModelFormat modelFormat, __u
     info.vertexAttributes = vertexAttributes;
     info.cullMode = cullMode;
     KRPipeline *pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
+
+    // Rim highlighting parameters
+    pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_RIM_COLOR, rim_color);
+    pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_RIM_POWER, rim_power);
     
     // Bind bones
     if(pShader->m_pushConstantOffset[KRPipeline::KRENGINE_UNIFORM_BONE_TRANSFORMS] != -1) {
@@ -436,7 +440,7 @@ void KRMaterial::bind(const KRNode::RenderInfo& ri, ModelFormat modelFormat, __u
         m_pContext->getTextureManager()->selectTexture(7, m_pReflectionMap, lod_coverage, KRTexture::TEXTURE_USAGE_REFLECTION_MAP);
     }
 
-    pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, matModel, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, rim_color, rim_power);
+    pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, matModel, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 }
 
 const std::string &KRMaterial::getName() const
diff --git a/kraken/KRParticleSystemNewtonian.cpp b/kraken/KRParticleSystemNewtonian.cpp
index c17b13e..1e772d0 100755
--- a/kraken/KRParticleSystemNewtonian.cpp
+++ b/kraken/KRParticleSystemNewtonian.cpp
@@ -105,7 +105,7 @@ void KRParticleSystemNewtonian::render(RenderInfo& ri) {
 
             KRPipeline *pParticleShader = m_pContext->getPipelineManager()->getPipeline(*ri.surface, info);
             pParticleShader->setUniform(KRPipeline::KRENGINE_UNIFORM_FLARE_SIZE, 1.0f);
-            pParticleShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+            pParticleShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 
             KRDataBlock index_data;
             m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, m_pContext->getMeshManager()->getRandomParticles(), index_data, (1 << KRMesh::KRENGINE_ATTRIB_VERTEX) | (1 << KRMesh::KRENGINE_ATTRIB_TEXUVA), false, 1.0f
diff --git a/kraken/KRPipeline.cpp b/kraken/KRPipeline.cpp
index 21e3b40..4a29986 100644
--- a/kraken/KRPipeline.cpp
+++ b/kraken/KRPipeline.cpp
@@ -520,7 +520,7 @@ void KRPipeline::setUniform(int location, const Matrix4 &value)
   }
 }
 
-bool KRPipeline::bind(VkCommandBuffer& commandBuffer, KRCamera &camera, const KRViewport &viewport, const Matrix4 &matModel, const std::vector<KRPointLight *> *point_lights, const std::vector<KRDirectionalLight *> *directional_lights, const std::vector<KRSpotLight *> *spot_lights, const KRNode::RenderPass &renderPass, const Vector3 &rim_color, float rim_power)
+bool KRPipeline::bind(VkCommandBuffer& commandBuffer, KRCamera &camera, const KRViewport &viewport, const Matrix4 &matModel, const std::vector<KRPointLight *> *point_lights, const std::vector<KRDirectionalLight *> *directional_lights, const std::vector<KRSpotLight *> *spot_lights, const KRNode::RenderPass &renderPass)
 {
     setUniform(KRENGINE_UNIFORM_ABSOLUTE_TIME, getContext().getAbsoluteTime());
     
@@ -674,10 +674,6 @@ bool KRPipeline::bind(VkCommandBuffer& commandBuffer, KRCamera &camera, const KR
         setUniform(KRENGINE_UNIFORM_VIEWPORT_DOWNSAMPLE, camera.getDownsample());
     }
     
-    // Rim highlighting parameters
-    setUniform(KRENGINE_UNIFORM_RIM_COLOR, rim_color);
-    setUniform(KRENGINE_UNIFORM_RIM_POWER, rim_power);
-    
     // Fog parameters
     setUniform(KRENGINE_UNIFORM_FOG_NEAR, camera.settings.fog_near);
     setUniform(KRENGINE_UNIFORM_FOG_FAR, camera.settings.fog_far);
diff --git a/kraken/KRPipeline.h b/kraken/KRPipeline.h
index e6f71c0..b62fdaa 100644
--- a/kraken/KRPipeline.h
+++ b/kraken/KRPipeline.h
@@ -210,7 +210,7 @@ public:
     virtual ~KRPipeline();
     const char *getKey() const;
     
-    bool bind(VkCommandBuffer& commandBuffer, KRCamera &camera, const KRViewport &viewport, const Matrix4 &matModel, const std::vector<KRPointLight *> *point_lights, const std::vector<KRDirectionalLight *> *directional_lights, const std::vector<KRSpotLight *>*spot_lights, const KRNode::RenderPass &renderPass, const Vector3 &rim_color, float rim_power);
+    bool bind(VkCommandBuffer& commandBuffer, KRCamera &camera, const KRViewport &viewport, const Matrix4 &matModel, const std::vector<KRPointLight *> *point_lights, const std::vector<KRDirectionalLight *> *directional_lights, const std::vector<KRSpotLight *>*spot_lights, const KRNode::RenderPass &renderPass);
 
     enum {
         KRENGINE_UNIFORM_MATERIAL_AMBIENT = 0,
diff --git a/kraken/KRPointLight.cpp b/kraken/KRPointLight.cpp
index 893f133..c8cf651 100755
--- a/kraken/KRPointLight.cpp
+++ b/kraken/KRPointLight.cpp
@@ -117,7 +117,7 @@ void KRPointLight::render(RenderInfo& ri)
             pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_DECAY_START, getDecayStart());
             pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_CUTOFF, KRLIGHT_MIN_INFLUENCE);                
             pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_LIGHT_POSITION, light_position);
-            pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &this_light, nullptr, nullptr, ri.renderPass, Vector3::Zero(), 0.0f);
+            pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &this_light, nullptr, nullptr, ri.renderPass);
                 
             if(bInsideLight) {
                 // Render a full screen quad
diff --git a/kraken/KRReverbZone.cpp b/kraken/KRReverbZone.cpp
index 2bf5471..f0baa80 100755
--- a/kraken/KRReverbZone.cpp
+++ b/kraken/KRReverbZone.cpp
@@ -143,7 +143,7 @@ void KRReverbZone::render(RenderInfo& ri)
 
           KRPipeline *pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
 
-          pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+          pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, sphereModelMatrix, &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 
           sphereModel->renderNoMaterials(ri.commandBuffer, ri.renderPass, getName(), "visualize_overlay", 1.0f);
         } // sphereModel
diff --git a/kraken/KRScene.cpp b/kraken/KRScene.cpp
index a7aaaca..7ce9a76 100755
--- a/kraken/KRScene.cpp
+++ b/kraken/KRScene.cpp
@@ -298,7 +298,7 @@ void KRScene::render(KRNode::RenderInfo& ri, KROctreeNode* pOctreeNode, unordere
                     info.modelFormat = ModelFormat::KRENGINE_MODEL_FORMAT_STRIP;
 
                     KRPipeline* pPipeline = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
-                    pPipeline->bind(ri.commandBuffer, *info.pCamera, ri.viewport, matModel, info.point_lights, info.directional_lights, info.spot_lights, info.renderPass, Vector3::Zero(), 0.0f);
+                    pPipeline->bind(ri.commandBuffer, *info.pCamera, ri.viewport, matModel, info.point_lights, info.directional_lights, info.spot_lights, info.renderPass);
                     vkCmdDraw(ri.commandBuffer, 14, 1, 0, 0);
                     m_pContext->getMeshManager()->log_draw_call(ri.renderPass, "octree", "occlusion_test", 14);
 
diff --git a/kraken/KRSprite.cpp b/kraken/KRSprite.cpp
index b10934b..6921bcc 100755
--- a/kraken/KRSprite.cpp
+++ b/kraken/KRSprite.cpp
@@ -159,7 +159,7 @@ void KRSprite::render(RenderInfo& ri) {
 
                 KRPipeline *pShader = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
                 pShader->setUniform(KRPipeline::KRENGINE_UNIFORM_MATERIAL_ALPHA, m_spriteAlpha);
-                pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass, Vector3::Zero(), 0.0f);
+                pShader->bind(ri.commandBuffer, *ri.camera, ri.viewport, getModelMatrix(), &ri.point_lights, &ri.directional_lights, &ri.spot_lights, ri.renderPass);
 
                 m_pContext->getTextureManager()->selectTexture(0, m_pSpriteTexture, 0.0f, KRTexture::TEXTURE_USAGE_SPRITE);
                 m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &vertices, 1.0f);