adding back xmappr