3.1

Covers changes found in chapter 3.1