reorder some sections for better flow