Edited EMA class