Reduce number of sections
Merge branch 'make'