Changes to sections 3.3, 4.1, & 5.4