added more rules
merge