Reorganized rules