Less convoluted update mechanism