simplify and update