Revision of sections 3.5-4.1.2
Revision of sections 4.1.2-4.1.5