Refactoring
changed sample