moving to mapper