Retake logic changed