added better autocomplete