Update and simplify.