refactor ZD

E to M