Major rule overhaul