Restructure and make rules 2 and 4 unconditional