mt refactor part 6