Modified some rules