Simplify + add more examples