Some work on syncing