more refactoring. configurations are working properly.