Update and simplify