Updated update behavior