nicer handling of updates