add improved(?) WordCount