remapping done
skip remap added