Removed 'mouse support' and added state changes