mw: get rid of modes vector