Switched from keymaster to mousetrap