Working on the restart