More work on shader code