Feature/emr 8