updates and migrate_d2d inclusion