Improved the update mechanism.