refactored configs