add more remaps