improvements in the migration closes #89