3.3

Covers changes found in chapter 3.3