Updated syncing logic...