refactor mvr