Bug fix and a bit different shader