Mode – aware remapping