Section 3 cleaned up