Merging some more stuff