Changed based on the review. Will be squashed once no more changes are needed.