Major change to simpler rule format