Added some rules, etc