Completed section 5.3.4