reconfigured for yadr