new version of emms from upstream