More robust update action