V7 refactoring md