Updated Edi
EMC