Changes from wordSuggestions project