Fixing Sync part 2