migrating to YADR