Section 3 Cleaned up