Added a few more rules