first round of update after getting feedbacks from reviewers