Updated with Chapter 6 exercises