fixed order of updates