Reorganized the rules