Following through the book from version 5.2