Second pass at nongift_migration