updating and simplifying