Tweaked update behavior