mv prediction refactoring