[pl] generalize old rule and add two new ones