improved migrator