Reworking sync updates