Addressed CR feedback.