reorder sections for much better flow