Updating changes and adding solutions for Chapter 5 and 6 exercises