more work on supporting config changes