adding mouse move
ff
fixing merge conflict