Updated more rules