updated to work wit evil-mode