if we keep them yes it looks like the most sensible way to ease the migration.