update & to do changes