Reorder sections, discussion added