going through chapter 6. No functional changes