Merge in new stuff, again