finishing up implementation of restart