Arranged some last sections into one section.