added wm2 and flwm