Few changes related to words count