edited retry part