Completed section 3.6.1