Tidy
EMVC merge