mt refactoring part 7