Updated for vsh for vi mode