Completed section 5.4.2