adapt to config setup changes