migration now moving all the data like we want