new wpm version (merged with main stream)