revisit sync section based on dandev comment