added more rules