Addressed Eric's comments.