split migration into two parts