Reverted, and added new mouse code