Switched to using the Shader class