[finish #74075352] rearrange sections