working on fixing mouse events