Chapter 7 - Final changes