Add sections 2.5, 3.1, 3.2