Made the mouse adapter efficient as well