some more updates for migration