Final before migrate