Merging all the new stuff.