Changed based on PR comments.