Completed section 8.2.6