playing with graphics
commit merge conflict fix