refactor for model/video of #6