Added more -1 and number of words.