Added more rules