Moved both new sections to the bottom so it's easier for upgraders to merge them