Attempt to improve VIM mode