Major reorganization of Section 3