working on sync fixing