working on making sync faster