simplify and update examples