Updated to work with my version of emacs