Added a couple more rules to the mix