Added changes from work .emacs