Use new update mechanism