Amarroom_EDM_update_nov-19