Updates and more defensive.