Updated to address comments.