added wm stuff