comment
tweaked for emacs server mode