more work on syncing