improve on auto-completion