Thomas's Syncing changes.