Sync improved