3.4

Covers changes found in chapter 3.4