Updated through Section 6.1