add auto-completion (once again)