Update with the latest changes