Add some new rules
Revise some rules