recapture logic changed