working on fixing and upgrading the mouse
merging