modified mapper, 19.02.14