Re-ordered form and Updated Sections