EMA improvements