added Mouse handling