Rev #5 of word-count