added a bunch more rules