Some changes for examples