started working on sync feature