Update with testing