Changes to section 2, 3, 7