config change, refactor