changed configurtion and made refactoring