Before changes to shader managment