Final commit before trying parallelization in data-migration.