On branch master (temp)

- work on control of shading