Migration solved v2