adjust the configuration
refactoring