Splitting Section 3&4.3 from PSR1 toggle