Merged updates into one shader.

Start work on more proof sorting