refactor
fix sample