added ,z -> e# mapping