refactoring
fix saving feature
work with: #7