v1 draftGuide plus refactoring