Updated Chapter 4 changes