incorporating EMV edits