Finalized the changes for eme.