Update with improvements