refactor to use new configuration