added better autocompletion