Jon's emacs added