Chapter 5 Changes from Hartl Tutorial