Chapter 7: Some improvements