Update with PR feedback