ticket:5 preporation before pushing to master