some more rules
merged