Improved the building of the sections.