Completed section 6.4.2