Refactored for mouseSync