Modifying for emacs 24.x