Use component values, simplify rules