Adding restart capability