Now adds words with and without punctuation included