Re-work the section 3