Added restart capability