Update with reviewer comments