added app_words, changed spaces to underscores