More chnages
added more retro-migration logic (UNFINISHED)