step 1 fixing handling of uniforms