Probably wasted time on WCount
Added some stuff