View modifications
Merge branch 'graphic'
resolved merge conflict