Updated for my new additions for emacs