Change order of sections for better cascade