updated for emacs mode having moved