Improved --update