Update with more comments