EMC mod with changes from git