Section 50 Refactoring