added autocomplete functionality - takes a long time to work