Improved the way the `update` is executed