Chapter 8 Changes from Hartl Tutorial