Shader

Some modifications (not ready yet)