merged version with config files