Add some nice remaps
other change