Address comments from Reviewer 2