more improvings of the new migration mode