Added more emacsness