Started changing the autocomplete implementation