modified esmapper