Commit Chapter 22 stuff