Final edits before getting the third feedbacks