diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index ca704d6..3be2cf8 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -35,7 +35,7 @@
 
     bindShader(shader, dontSync)
     {
-        if(this.shader === shader)return;
+     //   if(this.shader === shader)return;
 
         this.shader = shader;
 
@@ -53,85 +53,7 @@
         const shader = this.shader;
         const glShader = shader.glShaders[this.renderer.CONTEXT_UID];
 
-
-        const uniformData = shader.uniformData;
-        const realUniforms = shader.realUniforms;
-
-        // 0 is reserverd for the pixi texture so we start at 1!
-        let textureCount = 1;
-        let i = 0;
-
-        for (i in uniforms)
-        {
-            uniformData[i].value = uniforms[i];
-        }
-
-        // TODO don't need to use the uniform
-        for (let i in uniformData)
-        {
-            if (uniformData[i].type === 'sampler2D' && uniformData[i].value !== 0)
-            {
-                if (uniformData[i].value.baseTexture)
-                {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
-              //      console.log( glShader.uniforms[i])
-                }
-                else
-                {
-                    glShader.uniforms[i] = textureCount;
-                    // TODO
-                    // this is helpful as renderTargets can also be set.
-                    // Although thinking about it, we could probably
-                    // make the filter texture cache return a RenderTexture
-                    // rather than a renderTarget
-                    const gl = this.renderer.gl;
-
-                    gl.activeTexture(gl.TEXTURE0 + textureCount);
-                    uniforms[i].texture.bind();
-                }
-
-                textureCount++;
-            }
-            else if (uniformData[i].type === 'mat3')
-            {
-                // check if its pixi matrix..
-                if (uniformData[i].value.a !== undefined)
-                {
-                    glShader.uniforms[i] = uniformData[i].value.toArray(true);
-                }
-                else
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else if (uniformData[i].type === 'vec2')
-            {
-                // check if its a point..
-                if (uniformData[i].value.x !== undefined)
-                {
-                    const val = glShader.uniforms[i] || new Float32Array(2);
-
-                    val[0] = uniformData[i].value.x;
-                    val[1] = uniformData[i].value.y;
-                    glShader.uniforms[i] = val;
-                }
-                else
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else if (uniformData[i].type === 'float')
-            {
-                if (glShader.uniforms.data[i].value !== uniformData[i].value)
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else
-            {
-                glShader.uniforms[i] = uniformData[i].value;
-            }
-        }
+        shader.syncUniforms(glShader.uniformData, uniforms, this.gl);
     }
 
     generateShader(shader)

diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index ca704d6..3be2cf8 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -35,7 +35,7 @@
 
     bindShader(shader, dontSync)
     {
-        if(this.shader === shader)return;
+     //   if(this.shader === shader)return;
 
         this.shader = shader;
 
@@ -53,85 +53,7 @@
         const shader = this.shader;
         const glShader = shader.glShaders[this.renderer.CONTEXT_UID];
 
-
-        const uniformData = shader.uniformData;
-        const realUniforms = shader.realUniforms;
-
-        // 0 is reserverd for the pixi texture so we start at 1!
-        let textureCount = 1;
-        let i = 0;
-
-        for (i in uniforms)
-        {
-            uniformData[i].value = uniforms[i];
-        }
-
-        // TODO don't need to use the uniform
-        for (let i in uniformData)
-        {
-            if (uniformData[i].type === 'sampler2D' && uniformData[i].value !== 0)
-            {
-                if (uniformData[i].value.baseTexture)
-                {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
-              //      console.log( glShader.uniforms[i])
-                }
-                else
-                {
-                    glShader.uniforms[i] = textureCount;
-                    // TODO
-                    // this is helpful as renderTargets can also be set.
-                    // Although thinking about it, we could probably
-                    // make the filter texture cache return a RenderTexture
-                    // rather than a renderTarget
-                    const gl = this.renderer.gl;
-
-                    gl.activeTexture(gl.TEXTURE0 + textureCount);
-                    uniforms[i].texture.bind();
-                }
-
-                textureCount++;
-            }
-            else if (uniformData[i].type === 'mat3')
-            {
-                // check if its pixi matrix..
-                if (uniformData[i].value.a !== undefined)
-                {
-                    glShader.uniforms[i] = uniformData[i].value.toArray(true);
-                }
-                else
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else if (uniformData[i].type === 'vec2')
-            {
-                // check if its a point..
-                if (uniformData[i].value.x !== undefined)
-                {
-                    const val = glShader.uniforms[i] || new Float32Array(2);
-
-                    val[0] = uniformData[i].value.x;
-                    val[1] = uniformData[i].value.y;
-                    glShader.uniforms[i] = val;
-                }
-                else
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else if (uniformData[i].type === 'float')
-            {
-                if (glShader.uniforms.data[i].value !== uniformData[i].value)
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else
-            {
-                glShader.uniforms[i] = uniformData[i].value;
-            }
-        }
+        shader.syncUniforms(glShader.uniformData, uniforms, this.gl);
     }
 
     generateShader(shader)
diff --git a/src/core/shader/Shader.js b/src/core/shader/Shader.js
index 780fce9..6cf0f71 100644
--- a/src/core/shader/Shader.js
+++ b/src/core/shader/Shader.js
@@ -1,5 +1,6 @@
 import extractUniformsFromSrc from './extractUniformsFromSrc';
 import extractAttributesFromSrc from './extractAttributesFromSrc';
+import generateUniformsSync from './generateUniformsSync';
 
 let UID = 0;
 
@@ -64,7 +65,7 @@
         // TODO we could cache this!
         this.glShaders = {};
 
-
+        this.syncUniforms = generateUniformsSync(this.uniformData);
         this.id = UID++;
     }
 

diff --git a/src/core/renderers/webgl/ShaderManager.js b/src/core/renderers/webgl/ShaderManager.js
index ca704d6..3be2cf8 100644
--- a/src/core/renderers/webgl/ShaderManager.js
+++ b/src/core/renderers/webgl/ShaderManager.js
@@ -35,7 +35,7 @@
 
     bindShader(shader, dontSync)
     {
-        if(this.shader === shader)return;
+     //   if(this.shader === shader)return;
 
         this.shader = shader;
 
@@ -53,85 +53,7 @@
         const shader = this.shader;
         const glShader = shader.glShaders[this.renderer.CONTEXT_UID];
 
-
-        const uniformData = shader.uniformData;
-        const realUniforms = shader.realUniforms;
-
-        // 0 is reserverd for the pixi texture so we start at 1!
-        let textureCount = 1;
-        let i = 0;
-
-        for (i in uniforms)
-        {
-            uniformData[i].value = uniforms[i];
-        }
-
-        // TODO don't need to use the uniform
-        for (let i in uniformData)
-        {
-            if (uniformData[i].type === 'sampler2D' && uniformData[i].value !== 0)
-            {
-                if (uniformData[i].value.baseTexture)
-                {
-                    glShader.uniforms[i] = this.renderer.bindTexture(uniformData[i].value, textureCount, true);
-              //      console.log( glShader.uniforms[i])
-                }
-                else
-                {
-                    glShader.uniforms[i] = textureCount;
-                    // TODO
-                    // this is helpful as renderTargets can also be set.
-                    // Although thinking about it, we could probably
-                    // make the filter texture cache return a RenderTexture
-                    // rather than a renderTarget
-                    const gl = this.renderer.gl;
-
-                    gl.activeTexture(gl.TEXTURE0 + textureCount);
-                    uniforms[i].texture.bind();
-                }
-
-                textureCount++;
-            }
-            else if (uniformData[i].type === 'mat3')
-            {
-                // check if its pixi matrix..
-                if (uniformData[i].value.a !== undefined)
-                {
-                    glShader.uniforms[i] = uniformData[i].value.toArray(true);
-                }
-                else
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else if (uniformData[i].type === 'vec2')
-            {
-                // check if its a point..
-                if (uniformData[i].value.x !== undefined)
-                {
-                    const val = glShader.uniforms[i] || new Float32Array(2);
-
-                    val[0] = uniformData[i].value.x;
-                    val[1] = uniformData[i].value.y;
-                    glShader.uniforms[i] = val;
-                }
-                else
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else if (uniformData[i].type === 'float')
-            {
-                if (glShader.uniforms.data[i].value !== uniformData[i].value)
-                {
-                    glShader.uniforms[i] = uniformData[i].value;
-                }
-            }
-            else
-            {
-                glShader.uniforms[i] = uniformData[i].value;
-            }
-        }
+        shader.syncUniforms(glShader.uniformData, uniforms, this.gl);
     }
 
     generateShader(shader)
diff --git a/src/core/shader/Shader.js b/src/core/shader/Shader.js
index 780fce9..6cf0f71 100644
--- a/src/core/shader/Shader.js
+++ b/src/core/shader/Shader.js
@@ -1,5 +1,6 @@
 import extractUniformsFromSrc from './extractUniformsFromSrc';
 import extractAttributesFromSrc from './extractAttributesFromSrc';
+import generateUniformsSync from './generateUniformsSync';
 
 let UID = 0;
 
@@ -64,7 +65,7 @@
         // TODO we could cache this!
         this.glShaders = {};
 
-
+        this.syncUniforms = generateUniformsSync(this.uniformData);
         this.id = UID++;
     }
 
diff --git a/src/core/shader/generateUniformsSync.js b/src/core/shader/generateUniformsSync.js
new file mode 100644
index 0000000..1d7d478
--- /dev/null
+++ b/src/core/shader/generateUniformsSync.js
@@ -0,0 +1,170 @@
+var generateUniformsSync = function(uniformData)
+{
+
+    var textureCount = 1;
+    var func = 'let value = null;'
+
+    for (var i in uniformData)
+    {
+        let data = uniformData[i];
+
+        // TODO && uniformData[i].value !== 0 <-- do we still need this?
+        if(data.type === 'sampler2D')
+        {
+            func += '\ngl.uniform1iv(uniformData.'+i+'.location, renderer.bindTexture(uniformValues.' + i + ', ' + (textureCount++) + ', true) );\n'
+        }
+        else if (data.type === 'mat3')
+        {
+            func += '\nvalue = uniformValues.' + i + ';';
+            func += '\ngl.uniformMatrix3fv(uniformData.'+i+'.location, false, (value.a !== undefined) ? value : value.toArray(true));\n'
+        }
+        else if (data.type === 'vec2')
+        {
+            func += '\nvalue = uniformValues.' + i + ';\n';
+            func += '\nif(value.x !== undefined)gl.uniform2f(uniformData.'+i+'.location, value.x, value.y);'
+            func += '\nelse gl.uniform2f(uniformData.'+i+'.location, value[0], value[1]);\n'
+
+        }
+        else
+        {
+            var template = GLSL_TO_SINGLE_SETTERS[data.type].replace('location', 'uniformData.'+i+'.location');
+            func += '\nvalue = uniformValues.' + i + ';\n';
+            func += template +'\n';
+        }
+
+    };
+
+    console.log(func);
+
+    return new Function('uniformData', 'uniformValues', 'gl', func);
+}
+
+var generateUniformsSyncCached = function(uniformData)
+{
+
+    var textureCount = 1;
+    var func = 'let value = null; let cacheValue = null'
+
+    for (var i in uniformData)
+    {
+        let data = uniformData[i];
+
+        // TODO && uniformData[i].value !== 0 <-- do we still need this?
+        if(data.type === 'sampler2D')
+        {
+            func += '\ngl.uniform1iv(uniformData.'+i+'.location, renderer.bindTexture(uniformValues.' + i + ', ' + (textureCount++) + ', true) );\n'
+        }
+        else if (data.type === 'mat3')
+        {
+            func += '\nvalue = uniformValues.' + i + ';';
+            func += '\ngl.uniformMatrix3fv(uniformData.'+i+'.location, false, (value.a !== undefined) ? value : value.toArray(true));\n'
+        }
+        else if (data.type === 'vec2')
+        {
+            func += '\nvalue = uniformValues.' + i + ';\n';
+            func += '\nif(value.x !== undefined)gl.uniform2f(uniformData.'+i+'.location, value.x, value.y);'
+            func += '\nelse gl.uniform2f(uniformData.'+i+'.location, value[0], value[1]);\n'
+
+        }
+        else
+        {
+            var template = GLSL_TO_SINGLE_SETTERS_CACHED[data.type].replace('location', 'uniformData.'+i+'.location');
+            func += '\ncacheValue = uniformData.' + i + '.value;\n';
+            func += 'value = uniformValues.' + i + ';\n';
+            func += template +'\n';
+        }
+
+    };
+
+    console.log(func);
+
+    return new Function('uniformData', 'uniformValues', 'gl', func);
+}
+
+var GLSL_TO_SINGLE_SETTERS = {
+
+    'float':    'gl.uniform1f(location, value)',
+
+    'vec2':     'gl.uniform2f(location, value[0], value[1])',
+    'vec3':     'gl.uniform3f(location, value[0], value[1], value[2])',
+    'vec4':     'gl.uniform4f(location, value[0], value[1], value[2], value[3])',
+
+    'int':      'gl.uniform1i(location, value)',
+    'ivec2':    'gl.uniform2i(location, value[0], value[1])',
+    'ivec3':    'gl.uniform3i(location, value[0], value[1], value[2])',
+    'ivec4':    'gl.uniform4i(location, value[0], value[1], value[2], value[3])',
+
+    'bool':     'gl.uniform1i(location, value)',
+    'bvec2':    'gl.uniform2i(location, value[0], value[1])',
+    'bvec3':    'gl.uniform3i(location, value[0], value[1], value[2])',
+    'bvec4':    'gl.uniform4i(location, value[0], value[1], value[2], value[3])',
+
+    'mat2':     'gl.uniformMatrix2fv(location, false, value)',
+    'mat3':     'gl.uniformMatrix3fv(location, false, value)',
+    'mat4':     'gl.uniformMatrix4fv(location, false, value)',
+
+    'sampler2D':'uniform1i(location, value)'
+};
+
+var GLSL_TO_SINGLE_SETTERS_CACHED = {
+
+    'float':    `if(cacheValue !== value)
+{
+    cacheValue = value;
+    gl.uniform1f(location, value)
+}`
+
+    'vec2':     `if(cacheValue[0] !== value[0] || cacheValue[1] !== value[1])
+{
+    cacheValue[0] = value[0];
+    cacheValue[1] = value[1];
+    gl.uniform2f(location, value[0], value[1])
+}`
+    'vec3':     `if(cacheValue[0] !== value[0] || cacheValue[1] !== value[1] || cacheValue[2] !== value[2])
+{
+    cacheValue[0] = value[0];
+    cacheValue[1] = value[1];
+    cacheValue[2] = value[2];
+    gl.uniform3f(location, value[0], value[1], value[2])
+}`,
+    'vec4':     'gl.uniform4f(location, value[0], value[1], value[2], value[3])',
+
+    'int':      'gl.uniform1i(location, value)',
+    'ivec2':    'gl.uniform2i(location, value[0], value[1])',
+    'ivec3':    'gl.uniform3i(location, value[0], value[1], value[2])',
+    'ivec4':    'gl.uniform4i(location, value[0], value[1], value[2], value[3])',
+
+    'bool':     'gl.uniform1i(location, value)',
+    'bvec2':    'gl.uniform2i(location, value[0], value[1])',
+    'bvec3':    'gl.uniform3i(location, value[0], value[1], value[2])',
+    'bvec4':    'gl.uniform4i(location, value[0], value[1], value[2], value[3])',
+
+    'mat2':     'gl.uniformMatrix2fv(location, false, value)',
+    'mat3':     'gl.uniformMatrix3fv(location, false, value)',
+    'mat4':     'gl.uniformMatrix4fv(location, false, value)',
+
+    'sampler2D':'uniform1i(location, value)'
+};
+
+var GLSL_TO_ARRAY_SETTERS = {
+
+    'float':    'uniform1fv(location, value)',
+
+    'vec2':     'uniform2fv(location, value)',
+    'vec3':     'uniform3fv(location, value)',
+    'vec4':     'uniform4fv(location, value)',
+
+    'int':      'uniform1iv(location, value)',
+    'ivec2':    'uniform2iv(location, value)',
+    'ivec3':    'uniform3iv(location, value)',
+    'ivec4':    'uniform4iv(location, value)',
+
+    'bool':     'uniform1iv(location, value)',
+    'bvec2':    'uniform2iv(location, value)',
+    'bvec3':    'uniform3iv(location, value)',
+    'bvec4':    'uniform4iv(location, value)',
+
+    'sampler2D':'uniform1iv(location, value)'
+};
+
+module.exports = generateUniformsSyncCached;