Adding restart functionality - untested