[Sync] A bit more sync