Feature/emr 3