Modifies to address comments.