More robust updating