ms2, refactoring