Changing code to match chapter reorganization.