Incorporate reviewers comments