Finish Chapter 3 configuration changes