Simplify updating