added more remaps