Better auto-updating.