Refactoring entry/movie
refactoring entry + sample + proposal