Improved Word Count