CleanUp and 3rd shader added