refactored more configs