improved migration tool