some changes to mapping and vimsh