adding more remapping