more work to support new config system
3 files changed