Working on the updating