new handling of uniforms