Final (hopefully) pass on Section 4