cont. work on migration