Fixing up restart tool after testing