Some changes to sync