tweaked order of migrations