New WM

The solution for the new version of WM