refactor wmr_new