more work on config
more work on config