DESIGN: Reordered sections