updated working mapper