Completed section 7.2.2