refactor, add screenshot