MouseController improved