Working on Sync feature