Changes made by Ravikant to get AutoComplete working