Completed section 6.2.5