7.1-before
refactor
move method