many changes, prior to emacs upgrade