Completed section 5.1.2