Addressing first review comments.