major autocomplete changes (may break the whole thing)