full mapping rework