Updated with reviewer comments.