Some modification to Shader