more config re-engineering