Combine rules
Add missing forms