rechanged the logic will finnish after