Section 3.1
Update to fix conflict