I think I merged it all up