Completed section 6.1.5