Merging back all the new stuff