Combined the two migrations