Chapter 7 Changes from Hartl Tutorial