Commit Chapter 30 stuff