Additional changes for ch. 07