Moved things around, hopefully a merge conflict will happen