Merged updates from the main book.