Update with review comments