map replacement continued!