Updated through Section 5.2