Chapter 6 Changes from Hartl Tutorial